From: <fi...@sy...> - 2010-07-20 03:55:01
|
Author: finley Date: 2010-07-19 22:54:55 -0500 (Mon, 19 Jul 2010) New Revision: 4496 Modified: trunk/initrd_source/initrd.rul trunk/make.d/boel_binaries.inc Log: use mklibs.bef instead of mklibs Modified: trunk/initrd_source/initrd.rul =================================================================== --- trunk/initrd_source/initrd.rul 2010-07-20 03:54:01 UTC (rev 4495) +++ trunk/initrd_source/initrd.rul 2010-07-20 03:54:55 UTC (rev 4496) @@ -136,14 +136,14 @@ ifeq ($(ARCH),x86_64) ( \ cd $(INITRD_BUILD_DIR) && \ - $(PYTHON) $(INITRD_DIR)/mklibs -L /lib64:/usr/lib64:/lib:/usr/lib -v -d lib64 ./*bin/* \ + $(INITRD_DIR)/mklibs.bef -L /lib64:/usr/lib64:/lib:/usr/lib -v -d lib64 ./*bin/* \ ) # copy libnss files as they are not automatically included cp -a /lib64/libnss* $(INITRD_BUILD_DIR)/lib64 else ( \ cd $(INITRD_BUILD_DIR) && \ - $(PYTHON) $(INITRD_DIR)/mklibs -L /lib:/usr/lib:/lib64:/usr/lib64 -v -d lib ./*bin/* \ + $(INITRD_DIR)/mklibs.bef -L /lib:/usr/lib:/lib64:/usr/lib64 -v -d lib ./*bin/* \ ) # copy libnss files as they are not automatically included cp -a /lib/libnss* $(INITRD_BUILD_DIR)/lib Modified: trunk/make.d/boel_binaries.inc =================================================================== --- trunk/make.d/boel_binaries.inc 2010-07-20 03:54:01 UTC (rev 4495) +++ trunk/make.d/boel_binaries.inc 2010-07-20 03:54:55 UTC (rev 4496) @@ -136,10 +136,10 @@ ifeq ($(USERSPACE64),1) cd $(BOEL_BINARIES_DIR) \ - && $(PYTHON) $(TOPDIR)/initrd_source/mklibs -L $(SRC_DIR)/$(PARTED_DIR)/libparted/.libs:$(SRC_DIR)/$(LVM_DIR)/libdm:$(SRC_DIR)/$(E2FSPROGS_DIR)/lib:/lib64:/usr/lib64:/usr/kerberos/lib64:/lib:/usr/lib:/usr/kerberos/lib:/usr/local/lib:/opt/gnome/lib:/lib/tls:`find /lib/tls /usr/lib/tls /lib64/tls /usr/lib64/tls -type d 2>/dev/null | tr '\n' :` -v -d lib64 bin/* sbin/* usr/bin/* usr/sbin/* $(INITRD_BUILD_DIR)/*bin/* $(INITRD_BUILD_DIR)/usr/*bin/* + && $(TOPDIR)/initrd_source/mklibs.bef -L $(SRC_DIR)/$(PARTED_DIR)/libparted/.libs:$(SRC_DIR)/$(LVM_DIR)/libdm:$(SRC_DIR)/$(E2FSPROGS_DIR)/lib:/lib64:/usr/lib64:/usr/kerberos/lib64:/lib:/usr/lib:/usr/kerberos/lib:/usr/local/lib:/opt/gnome/lib:/lib/tls:`find /lib/tls /usr/lib/tls /lib64/tls /usr/lib64/tls -type d 2>/dev/null | tr '\n' :` -v -d lib64 bin/* sbin/* usr/bin/* usr/sbin/* $(INITRD_BUILD_DIR)/*bin/* $(INITRD_BUILD_DIR)/usr/*bin/* else cd $(BOEL_BINARIES_DIR) \ - && $(PYTHON) $(TOPDIR)/initrd_source/mklibs -L $(SRC_DIR)/$(PARTED_DIR)/libparted/.libs:$(SRC_DIR)/$(LVM_DIR)/libdm:$(SRC_DIR)/$(E2FSPROGS_DIR)/lib:/lib:/usr/lib:/usr/kerberos/lib:/usr/local/lib:/opt/gnome/lib:/lib/tls:`find /lib/tls /usr/lib/tls -type d 2>/dev/null | tr '\n' :` -v -d lib bin/* sbin/* usr/bin/* usr/sbin/* $(INITRD_BUILD_DIR)/*bin/* $(INITRD_BUILD_DIR)/usr/*bin/* + && $(TOPDIR)/initrd_source/mklibs.bef -L $(SRC_DIR)/$(PARTED_DIR)/libparted/.libs:$(SRC_DIR)/$(LVM_DIR)/libdm:$(SRC_DIR)/$(E2FSPROGS_DIR)/lib:/lib:/usr/lib:/usr/kerberos/lib:/usr/local/lib:/opt/gnome/lib:/lib/tls:`find /lib/tls /usr/lib/tls -type d 2>/dev/null | tr '\n' :` -v -d lib bin/* sbin/* usr/bin/* usr/sbin/* $(INITRD_BUILD_DIR)/*bin/* $(INITRD_BUILD_DIR)/usr/*bin/* endif ifdef IS_PPC64 |