Changeset 2033

Show
Ignore:
Timestamp:
08/19/07 04:43:28 (1 year ago)
Author:
alexander
Message:

Synchronized with trunk, fixed initramfs build

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • branches/minimal/Makefile

    r2027 r2033  
    283283        ch-blfs-bootscripts ch-oui-data ch-hibernate-script ch-slang ch-mc \ 
    284284        ch-fuse ch-dosfstools ch-ntfsprogs ch-libaal ch-reiser4progs \ 
    285         ch-bin86 ch-lilo ch-syslinux ch-scsi-firmware ch-net-firmware ch-initramfs ch-linux32 
     285        ch-bin86 ch-lilo ch-syslinux ch-scsi-firmware ch-net-firmware ch-linux32 
    286286ifeq ($(CD_ARCH),x86) 
    287287        make ch-grub 
    …… 
    399399        @sed -i "s/\[version\]/$(VERSION)/" $(MP)/root/README 
    400400        @install -m600 root/.bashrc $(MP)/root/.bashrc 
    401         @install -m755 scripts/{net-setup,greeting} $(MP)/usr/bin/  
    402         @install -m755 scripts/{livecd-login,shutdown-helper} $(MP)/usr/bin/ 
     401        @install -m755 scripts/{net-setup,greeting,livecd-login} $(MP)/usr/bin/  
     402        @sed s/@LINKER@/$(LINKER)/ scripts/shutdown-helper.in >$(MP)/usr/bin/shutdown-helper 
     403        @chmod 755 $(MP)/usr/bin/shutdown-helper 
    403404        @svn export --force root $(MP)/etc/skel 
    404405 

  • branches/minimal/packages/initramfs/Makefile

    r2027 r2033  
    2727        cp /etc/udev/rules.d/{05-*,2*,60-*} $(WDIR)/etc/udev/rules.d 
    2828        sed -i 's/, *GROUP="[^"]*"//' $(WDIR)/etc/udev/rules.d/* 
    29         sed s/@VERSION@/$(VERSION)/ init.in >$(WDIR)/init 
     29        sed -e s/@VERSION@/$(VERSION)/ -e s/@LINKER@/$(LINKER)/ init.in >$(WDIR)/init 
    3030        chmod 755 $(WDIR)/init 
    3131        cp fakecd.iso.head $(WDIR) 

  • branches/minimal/packages/initramfs/init.in

    r1994 r2033  
    1818nodhcp=0 
    1919cdtype= 
    20  
    21 case `uname -m` in  
    22         i[3456]86) LINKER="ld-linux.so.2" ;; 
    23  
    24         x86_64) LINKER="ld-linux-x86-64.so.2" ;; 
    25 esac 
    2620 
    2721find_cd() { 
    …… 
    345339# Clean up and free some memory 
    346340rm -rf /bin /sbin /lib /sys /proc /dev /.tmpfs /init /fakecd.iso.head 
    347 ./lib/${LINKER} --library-path ./lib ./bin/mount -n --move . / 
    348 exec ../lib/${LINKER} --library-path ./lib ./usr/sbin/chroot . "$init" "$@" 
     341./lib/@LINKER@ --library-path ./lib ./bin/mount -n --move . / 
     342exec ../lib/@LINKER@ --library-path ./lib ./usr/sbin/chroot . "$init" "$@" 

  • branches/minimal/packages/net-firmware/Makefile

    r2027 r2033  
    8383SHA-$(FILE17)= 8f40bd8448c136e7edcc005f45e657258085ab8e 
    8484 
    85 DIR18= iwlwifi-3945-ucode-2.14.1.5 
     85DIR18= iwlwifi-3945-ucode-2.14.4 
    8686FILE18= $(DIR18).tgz 
    8787URL-$(FILE18)= http://intellinuxwireless.org/iwlwifi/downloads/$(FILE18) 
    88 SHA-$(FILE18)= aeeeccb2fddeff86ee7dbdca0f0d627d0c99d45c 
     88SHA-$(FILE18)= c715e4f0ab4ddddb45f6b5c36644e13dc0cd0b2c 
    8989 
    90 DIR19= iwlwifi-4965-ucode-4.44.1.18 
     90DIR19= iwlwifi-4965-ucode-4.44.17 
    9191FILE19= $(DIR19).tgz 
    9292URL-$(FILE19)= http://intellinuxwireless.org/iwlwifi/downloads/$(FILE19) 
    93 SHA-$(FILE19)= 01bf0264cfc4f60957a7242264050a81c56858bf 
    94  
    95 DIR20= iwlwifi-4965-ucode-4.44.17 
    96 FILE20= $(DIR20).tgz 
    97 URL-$(FILE20)= http://intellinuxwireless.org/iwlwifi/downloads/$(FILE20) 
    98 SHA-$(FILE20)= 955d8718419dc2670d9b8167e22df118a36666a5 
     93SHA-$(FILE19)= 955d8718419dc2670d9b8167e22df118a36666a5 
    9994 
    10095ALLFILES= $(foreach FILE,$(sort $(filter FILE%,$(.VARIABLES))),$($(FILE))) 
    …… 
    130125        @tar xf $(FILE18) ; cp $(DIR18)/* /lib/firmware 
    131126        @tar xf $(FILE19) ; cp $(DIR19)/* /lib/firmware 
    132         @tar xf $(FILE20) ; cp $(DIR20)/* /lib/firmware 
    133127        @make clean 
    134128        @touch $@