Changeset 1927

Timestamp:

06/24/07 08:53:43 (19 months ago)

Author:

alexander

Message:

Added a lot of firmware, wpa_supplicant (probably misconfigured)
and the nodhcp boot option.

Location:

trunk

Files:

• Makefile (modified) (2 diffs)
• packages/initramfs/Makefile (modified) (2 diffs)
• packages/initramfs/init.in (modified) (3 diffs)
• packages/net-firmware (added)
• packages/net-firmware/Makefile (added)
• packages/scsi-firmware (added)
• packages/scsi-firmware/Makefile (added)
• packages/wpa_supplicant (added)
• packages/wpa_supplicant/Makefile (added)
• scripts/functions (modified) (1 diff)

trunk/Makefile

@@ -257 +257 @@
         ch-librsvg ch-startup-notification chroot-gvim ch-vte ch-URI ch-xfce \
         ch-xfmedia ch-irssi ch-pidgin ch-net-tools \
-        ch-xchat ch-wireless_tools ch-tcpwrappers ch-portmap ch-nfs-utils \
+        ch-xchat ch-wireless_tools ch-wpa_supplicant \
+        ch-tcpwrappers ch-portmap ch-nfs-utils \
         ch-traceroute ch-rsync ch-jhalfs ch-sudo ch-bc ch-dialog ch-ncftp  \
         ch-device-mapper ch-LVM2 ch-dmraid \
@@ -271 +272 @@
         ch-fuse ch-dosfstools ch-ntfsprogs \
         ch-vbetool ch-bin86 ch-grub ch-lilo ch-syslinux \
-        ch-binutils64 ch-gcc64 ch-linux64 ch-initramfs
+        ch-binutils64 ch-gcc64 ch-linux64 ch-scsi-firmware ch-net-firmware \
+        ch-initramfs
         # Proprietary drivers disabled - NVIDIA crashes, ATI is too fat
         # make ch-gcc33 ch-proprietary-drivers

trunk/packages/initramfs/Makefile

@@ -20 +20 @@
 
 compile-stage2:
-        mkdir -p $(WDIR)/{bin,dev,etc/udev/rules.d,lib,sbin,sys,proc}
+        mkdir -p $(WDIR)/{bin,dev,etc/udev/rules.d,lib/firmware,sbin,sys,proc}
         cp /etc/udev/udev.conf $(WDIR)/etc/udev/udev.conf
         cp /etc/udev/rules.d/{05-*,2*,60-*} $(WDIR)/etc/udev/rules.d
@@ -36 +36 @@
         cp /usr/lib/libdevmapper.so.1.02 $(WDIR)/lib
         cp -a /lib/udev $(WDIR)/lib
+        cp -a /lib/firmware/{aic94xx-seq.fw,ql*.bin} $(WDIR)/lib/firmware
         cp /sbin/{losetup,blockdev,udevd,udevtrigger,udevsettle,modprobe} $(WDIR)/sbin
         cp /sbin/pcmcia-{check-broken-cis,socket-startup} $(WDIR)/sbin

trunk/packages/initramfs/init.in

@@ -15 +15 @@
 all_generic_ide=0
 toram=0
+nodhcp=0
 cdtype=
 
@@ -149 +150 @@
         mount -n -t ext2 /dev/mapper/lfs-cd /.root
         mount -n --move /.tmpfs /.root/dev/shm
-        if [ "$toram" != 1 ] ; then cp -a /dev/lfs-cd /.root/dev/lfs-cd ; fi
+        if [ "$toram" != 1 ] ; then
+                cp -a /dev/lfs-cd /.root/dev/lfs-cd
+        fi
         cat /etc/modprobe.conf >>/.root/etc/modprobe.conf
         ln -sf issue.$cdtype /.root/etc/issue
         if [ "$cdtype" = "fullcd" ] ; then
                 ln -sf /dev/shm/.cdrom/lfs-sources /.root/lfs-sources
+        fi
+        if [ "$nodhcp" = "1" ] ; then
+                rm -f /.root/etc/udev/rules.d/76-network.rules
         fi
 }
@@ -226 +232 @@
         toram)
                 toram=1
+                ;;
+        nodhcp)
+                nodhcp=1
                 ;;
         esac

trunk/scripts/functions

@@ -49 +49 @@
 # This takes the form of 'download [filename] [url] [sha1sum]'
 define download
-        @cd $(SRC) ; if [ ! -f $(1) ] ; then $(WGET) $(2) ; \
+        @cd $(SRC) ; if [ ! -f "$(1)" ] ; then $(WGET) "$(2)" ; \
          elif ! echo "$(3)  $(SRC)/$(1)" | sha1sum -c - >/dev/null 2>/dev/null ; then \
-         $(WGET) -c $(2) ; fi
+         $(WGET) -c "$(2)" ; fi
         @if echo "$(3)  $(SRC)/$(1)" | sha1sum -c - >/dev/null 2>/dev/null ; then \
-         echo $(BRW)sha1sum check on $(SRC)/$(1): $(GREEN)[ OK ]$(WHITE); \
-         else echo $(BRW)sha1sum check on $(SRC)/$(1): $(RED)[ FAILED ]$(WHITE); exit 1 ; fi
-        @ln -sf $(SRC)/$(1) .
+         echo $(BRW)sha1sum check on "$(SRC)/$(1)": $(GREEN)[ OK ]$(WHITE); \
+         else echo $(BRW)sha1sum check on "$(SRC)/$(1)": $(RED)[ FAILED ]$(WHITE); exit 1 ; fi
+        @ln -sf "$(SRC)/$(1)" .
 endef