r1927 - in trunk: . packages packages/initramfs packages/net-firmware packages/scsi-firmware packages/wpa_supplicant scripts

alexander at linuxfromscratch.org alexander at linuxfromscratch.org
Sun Jun 24 07:53:43 PDT 2007


Author: alexander
Date: 2007-06-24 08:53:43 -0600 (Sun, 24 Jun 2007)
New Revision: 1927

Added:
   trunk/packages/net-firmware/
   trunk/packages/net-firmware/Makefile
   trunk/packages/scsi-firmware/
   trunk/packages/scsi-firmware/Makefile
   trunk/packages/wpa_supplicant/
   trunk/packages/wpa_supplicant/Makefile
Modified:
   trunk/Makefile
   trunk/packages/initramfs/Makefile
   trunk/packages/initramfs/init.in
   trunk/scripts/functions
Log:
Added a lot of firmware, wpa_supplicant (probably misconfigured)
and the nodhcp boot option.


Modified: trunk/Makefile
===================================================================
--- trunk/Makefile	2007-06-24 05:25:17 UTC (rev 1926)
+++ trunk/Makefile	2007-06-24 14:53:43 UTC (rev 1927)
@@ -256,7 +256,8 @@
 	ch-pciutils ch-libusb ch-usbutils ch-dbus ch-dbus-glib ch-parted \
 	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 \
 	ch-dhcpcd ch-distcc ch-ppp ch-rp-pppoe \
@@ -270,7 +271,8 @@
 	ch-hibernate-script ch-slang ch-mc \
 	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
 	make update-caches

Modified: trunk/packages/initramfs/Makefile
===================================================================
--- trunk/packages/initramfs/Makefile	2007-06-24 05:25:17 UTC (rev 1926)
+++ trunk/packages/initramfs/Makefile	2007-06-24 14:53:43 UTC (rev 1927)
@@ -19,7 +19,7 @@
 	@touch $@
 
 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
 	sed -i 's/, *GROUP="[^"]*"//' $(WDIR)/etc/udev/rules.d/*
@@ -35,6 +35,7 @@
 	cp /lib/{libvolume_id.so.0,libsysfs.so.2} $(WDIR)/lib
 	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
 	cp /usr/bin/stat $(WDIR)/bin

Modified: trunk/packages/initramfs/init.in
===================================================================
--- trunk/packages/initramfs/init.in	2007-06-24 05:25:17 UTC (rev 1926)
+++ trunk/packages/initramfs/init.in	2007-06-24 14:53:43 UTC (rev 1927)
@@ -14,6 +14,7 @@
 resume=
 all_generic_ide=0
 toram=0
+nodhcp=0
 cdtype=
 
 find_cd() {
@@ -148,12 +149,17 @@
 	echo "0 $SIZE snapshot /dev/loop0 /dev/loop1 p 8" | /sbin/dmsetup create lfs-cd
 	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
 }
 
 do_mount_root() {
@@ -226,6 +232,9 @@
 	toram)
 		toram=1
 		;;
+	nodhcp)
+		nodhcp=1
+		;;
 	esac
 done
 

Added: trunk/packages/net-firmware/Makefile
===================================================================
--- trunk/packages/net-firmware/Makefile	                        (rev 0)
+++ trunk/packages/net-firmware/Makefile	2007-06-24 14:53:43 UTC (rev 1927)
@@ -0,0 +1,108 @@
+# network firmware Makefile
+
+NM= net-firmware
+VRS= 1
+
+UNCOMPRESSED_FILE1= t3fw-3.3.0.bin
+FILE1= $(UNCOMPRESSED_FILE1).gz
+URL-$(FILE1)= http://service.chelsio.com/drivers/firmware/t3/$(FILE1)
+SHA-$(FILE1)= 6c2965f7eaa7e0f18c2e7d7e9afe470850b502ee
+
+# The magic number below is available only after accepting the license at
+# http://www.myri.com/scs/download-Myri10GE-firmware-only.html
+DIR2= myri-fw-v1.4.21
+FILE2= $(DIR2).tar.gz
+URL-$(FILE2)= http://www.myri.com/download/files/14339216127782641291/$(FILE2)
+SHA-$(FILE2)= a0e6aada257bf2599261e03a91b0d6f41be7bd4f
+
+DIR3= atmel-firmware-1.3
+FILE3= $(DIR3).tar.gz
+URL-$(FILE3)= http://www.thekelleys.org.uk/atmel/$(FILE3)
+SHA-$(FILE3)= 8027f505dc49c8322c8593ce05ec2b73391b74c7
+
+FILE4= wl_apsta.o
+URL-$(FILE4)= http://svit.epfl.ch/stuff/$(FILE4)
+SHA-$(FILE4)= b1f61d283bd7d05ade313da522cb0d0ad4033652
+
+DIR5= bcm43xx-fwcutter-006
+FILE5= $(DIR5).tar.bz2
+URL-$(FILE5)= http://download.berlios.de/bcm43xx/$(FILE5)
+SHA-$(FILE5)= 45e43fb7784812def77c1190dcab122f73a20708
+
+DIR6= ipw2100-fw-1.3
+FILE6= $(DIR6).tgz
+URL-$(FILE6)= http://bughost.org/firmware/$(FILE6)
+SHA-$(FILE6)= aa8276f9710dc009566952d49677cb824ab866a7
+
+DIR7= ipw2200-fw-3.0
+FILE7= $(DIR7).tgz
+URL-$(FILE7)= http://bughost.org/firmware/$(FILE7)
+SHA-$(FILE7)= 84c28f1bed09c4d54bedf43492bd7884d0593928
+
+# 2.7.0.0 is for a different driver
+FILE8= 1.0.4.3.arm
+URL-$(FILE8)= http://prism54.org/firmware/$(FILE8)
+SHA-$(FILE8)= d0b5260b64e624c933ad506f85730ce07598431c
+
+FILE9= 1.1.0.0.arm
+URL-$(FILE9)= http://prism54.org/firmware/$(FILE9)
+SHA-$(FILE9)= 9ad6ce05cbf162e4f3c1c4759b3a010535cfca54
+
+DIR10= zd1201-0.14-fw
+FILE10= $(DIR10).tar.gz
+URL-$(FILE10)= http://easynews.dl.sourceforge.net/sourceforge/linux-lc100020/$(FILE10)
+SHA-$(FILE10)= 8f0510576f06fe00b4ac2e5eaadecbf208b47ae7
+
+DIR11= zd1211-firmware
+FILE11= $(DIR11)1.3.tar.bz2
+URL-$(FILE11)= http://easynews.dl.sourceforge.net/sourceforge/zd1211/$(FILE11)
+SHA-$(FILE11)= affce8c1167c9df1fcd8b53826ee0cb8d40ec12f
+
+DIR12= orinoco-fwutils-0.2
+FILE12= $(DIR12).tar.gz
+URL-$(FILE12)= http://easynews.dl.sourceforge.net/sourceforge/orinoco/orinoco-fwutils-0.2.tar.gz
+SHA-$(FILE12)= 02557624c3ea0b7b61ffc4aeb7f1a0c5270c5c3e
+
+FILE13= MC&DriverOnlyInstallers.zip
+URL-$(FILE13)= ftp://symstore.longisland.com/Symstore/services_download/wirless_prod/$(FILE13)
+SHA-$(FILE13)= b597eb9afc23beca309e8e8001edd88e5521dd92
+
+ALLFILES= $(foreach FILE,$(sort $(filter FILE%,$(.VARIABLES))),$($(FILE)))
+
+# Targets
+
+include $(ROOT)/scripts/functions
+
+chroot:
+	chroot "$(MP)" $(chenv-blfs) \
+	'cd $(ROOT) && make ch-$(NM) $(chbash-post-bash)'
+
+stage2: Makefile $(ALLFILES)
+	@zcat $(FILE1) >/lib/firmware/$(UNCOMPRESSED_FILE1)
+	@tar xf $(FILE2)
+	@cd $(DIR2) ; for a in "" p r ; do \
+	    cp eth$${a}_z8e.dat /lib/firmware/myri10ge_eth$${a}_z8e.dat ; done
+	@tar xf $(FILE3)
+	@find $(DIR3) -name \*.bin | xargs -i cp \{\} /lib/firmware
+	@tar xf $(FILE5)
+	@cd $(DIR5) ; make ; ./bcm43xx-fwcutter ../$(FILE4) ; cp *.fw /lib/firmware
+	@mkdir $(DIR6) ; cd $(DIR6) ; tar xf ../$(FILE6) ; cp * /lib/firmware
+	@tar xf $(FILE7) ; cp $(DIR7)/* /lib/firmware
+	@cp $(FILE8) /lib/firmware ; \
+	    for a in 86 90 ; do ln -sf $(FILE8) /lib/firmware/isl38$$a ; done
+	@cp $(FILE9) /lib/firmware ; ln -sf $(FILE9) /lib/firmware/isl3877
+	@tar xf $(FILE10) ; cp $(DIR10)/*.fw /lib/firmware
+	@tar xf $(FILE11) ; mkdir -p /lib/firmware/zd1211 ; \
+	    cp $(DIR11)/zd* /lib/firmware/zd1211
+	@tar xf $(FILE12) ; cd $(DIR12) ; cp "../$(FILE13)" . ; \
+	    ./get_symbol_fw ; cp symbol_* /lib/firmware
+	@make clean
+	@touch $@
+
+clean:
+	rm -rf */
+
+$(ALLFILES):
+	$(call download,$@,$(URL-$@),$(SHA-$@))
+
+.PHONY: clean chroot compile-stage2

Added: trunk/packages/scsi-firmware/Makefile
===================================================================
--- trunk/packages/scsi-firmware/Makefile	                        (rev 0)
+++ trunk/packages/scsi-firmware/Makefile	2007-06-24 14:53:43 UTC (rev 1927)
@@ -0,0 +1,51 @@
+# SCSI firmware Makefile
+
+NM= scsi-firmware
+VRS= 1
+
+FILE1= aic94xx-seq.fw
+URL-$(FILE1)= http://kernel.org/pub/linux/kernel/people/jejb/$(FILE1)
+SHA-$(FILE1)= fd4e5b1a1cc6ca077a3e7a537d7b5a911d6737d9
+
+QLOGIC= http://ftp.qlogic.com/outgoing/linux/firmware
+
+FILE2= ql2100_fw.bin
+URL-$(FILE2)= $(QLOGIC)/$(FILE2)
+SHA-$(FILE2)= 6af0888a1ac0db47ef07c7860ef2b648b5b4034b
+
+FILE3= ql2200_fw.bin
+URL-$(FILE3)= $(QLOGIC)/$(FILE3)
+SHA-$(FILE3)= 0c805365855fee846e4b4c41805660f5c40137d5
+
+FILE4= ql2300_fw.bin
+URL-$(FILE4)= $(QLOGIC)/$(FILE4)
+SHA-$(FILE4)= 03a53bf7e2408b05424a202e05b7261c7934d32f
+
+FILE5= ql2322_fw.bin
+URL-$(FILE5)= $(QLOGIC)/$(FILE5)
+SHA-$(FILE5)= ac606910f140c30164f9f2c04f990d5577f7c28e
+
+FILE6= ql2400_fw.bin
+URL-$(FILE6)= $(QLOGIC)/$(FILE6)
+SHA-$(FILE6)= 01f39c0c4d9657b348fe8e682bc34bcfc4057e03
+
+ALLFILES= $(foreach FILE,$(sort $(filter FILE%,$(.VARIABLES))),$($(FILE)))
+
+# Targets
+
+include $(ROOT)/scripts/functions
+
+chroot:
+	chroot "$(MP)" $(chenv-blfs) \
+	'cd $(ROOT) && make ch-$(NM) $(chbash-post-bash)'
+
+stage2: Makefile $(ALLFILES)
+	@cp $(ALLFILES) /lib/firmware
+	@touch $@
+
+clean:
+
+$(ALLFILES):
+	$(call download,$@,$(URL-$@),$(SHA-$@))
+
+.PHONY: clean chroot compile-stage2

Added: trunk/packages/wpa_supplicant/Makefile
===================================================================
--- trunk/packages/wpa_supplicant/Makefile	                        (rev 0)
+++ trunk/packages/wpa_supplicant/Makefile	2007-06-24 14:53:43 UTC (rev 1927)
@@ -0,0 +1,32 @@
+# wpa_supplicant Makefile
+
+NM= wpa_supplicant
+VRS= 0.5.8
+DIR= $(NM)-$(VRS)
+
+FILE= $(DIR).tar.gz
+URL-$(FILE)= http://hostap.epitest.fi/releases/$(FILE)
+SHA-$(FILE)= 434545faf4758044629f574d82939511be8deb0b
+
+# Targets
+
+include $(ROOT)/scripts/functions
+
+chroot:
+	chroot "$(MP)" $(chenv-post-bash) \
+	'cd $(ROOT) && make ch-$(NM) $(chbash-post-bash)'
+
+stage2: Makefile $(FILE)
+	$(std_build)
+
+compile-stage2:
+	cp defconfig .config
+	make
+	install -m755 wpa_supplicant wpa_passphrase wpa_cli /usr/bin
+	mkdir -p /etc/wpa_supplicant
+	cp examples/*.conf /etc/wpa_supplicant
+
+clean:
+	-rm -rf $(DIR)
+
+.PHONY: clean chroot compile-stage2

Modified: trunk/scripts/functions
===================================================================
--- trunk/scripts/functions	2007-06-24 05:25:17 UTC (rev 1926)
+++ trunk/scripts/functions	2007-06-24 14:53:43 UTC (rev 1927)
@@ -48,13 +48,13 @@
 
 # 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
 
 %.gz %.tgz %.bz2 %.zip %.patch %.diff %.rules %.ttf %.jpg %.run:




More information about the livecd mailing list