Changeset 4496

Show
Ignore:
Timestamp:
07/19/10 22:54:55 (2 months ago)
Author:
finley
Message:

use mklibs.bef instead of mklibs

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/initrd_source/initrd.rul

    r4494 r4496  
    137137        ( \ 
    138138                cd $(INITRD_BUILD_DIR) && \ 
    139                 $(PYTHON) $(INITRD_DIR)/mklibs -L /lib64:/usr/lib64:/lib:/usr/lib -v -d lib64 ./*bin/* \ 
     139                $(INITRD_DIR)/mklibs.bef -L /lib64:/usr/lib64:/lib:/usr/lib -v -d lib64 ./*bin/* \ 
    140140        ) 
    141141        # copy libnss files as they are not automatically included 
    …… 
    144144        ( \ 
    145145                cd $(INITRD_BUILD_DIR) && \ 
    146                 $(PYTHON) $(INITRD_DIR)/mklibs -L /lib:/usr/lib:/lib64:/usr/lib64 -v -d lib ./*bin/* \ 
     146                $(INITRD_DIR)/mklibs.bef -L /lib:/usr/lib:/lib64:/usr/lib64 -v -d lib ./*bin/* \ 
    147147        ) 
    148148        # copy libnss files as they are not automatically included 

  • trunk/make.d/boel_binaries.inc

    r4488 r4496  
    137137ifeq ($(USERSPACE64),1) 
    138138        cd $(BOEL_BINARIES_DIR) \ 
    139                 && $(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/* 
     139                && $(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/* 
    140140else 
    141141        cd $(BOEL_BINARIES_DIR) \ 
    142                 && $(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/* 
     142                && $(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/* 
    143143endif 
    144144