Author: alexander Date: 2007-10-10 09:13:35 -0600 (Wed, 10 Oct 2007) New Revision: 2103
Modified: trunk/packages/linux/Makefile trunk/packages/linux/debian-style-headers.sh trunk/packages/linux64/Makefile trunk/packages/linux64/debian-style-headers.sh Log: Replaced madwifi with ath5k - an open-source driver for the same hardware. Adjusted debian-style-headers.sh so that it doesn't atempt to copy files that no longer exist in linux-2.6.22. Modified: trunk/packages/linux/Makefile =================================================================== --- trunk/packages/linux/Makefile 2007-10-10 13:33:16 UTC (rev 2102) +++ trunk/packages/linux/Makefile 2007-10-10 15:13:35 UTC (rev 2103) @@ -53,11 +53,16 @@ URL-$(FILE7)= http://www.linuxfromscratch.org/~alexander/$(FILE7) SHA-$(FILE7)= 3eba4dc8e08ce256280adff492b541bda9c0198b -DIR8= madwifi-0.9.3.2 -FILE8= $(DIR8).tar.bz2 -URL-$(FILE8)= http://easynews.dl.sourceforge.net/sourceforge/madwifi/$(FILE8) -SHA-$(FILE8)= ccd8f4ba267df75ca002d8dbf66b09347e1bc0b6 +# The latest version from +# http://ftp.kernel.org/pub/linux/kernel/people/linville/wireless-2.6/ath5k/ +# does not compile against linux-2.6.22. So here is an old SVN snapshot +# from http://madwifi.org/ +DIR8= ath5k-r2701 +FILE8= $(DIR8).tar.gz +URL-$(FILE8)= http://www.linuxfromscratch.org/~alexander/$(FILE8) +SHA-$(FILE8)= d14a002ba192788881ca9a715348f8b7b898fe3c + DIR9=rtl-mac80211-20070729 FILE9= $(DIR9).tar.bz2 URL-$(FILE9)= http://www.hauke-m.de/fileadmin/rtl-wifi/$(FILE9) @@ -109,11 +114,7 @@ patch -Np0 -i ../../$(PATCH2) ; make KERNDIR=`pwd`/.. ; \ make KERNDIR=`pwd`/.. install tar xf ../$(FILE8) ; cd $(DIR8) ; \ - make BINDIR=/usr/bin MANDIR=/usr/share/man KERNELPATH=`pwd`/.. ; \ - make BINDIR=/usr/bin MANDIR=/usr/share/man KERNELPATH=`pwd`/.. DESTDIR=`pwd`/DESTDIR-modules install-modules ; \ - make BINDIR=/usr/bin MANDIR=/usr/share/man KERNELPATH=`pwd`/.. DESTDIR=`pwd`/DESTDIR-tools install-tools ; \ - cd DESTDIR-modules ; tar zcvf ../../$(DIR8)-kernel-$(VRS).tgz . ; cd .. ; \ - cd DESTDIR-tools ; tar zcvf ../../$(DIR8)-tools.tgz . + make KDIR=`pwd`/.. ; make KDIR=`pwd`/.. install rm -rf $(DIR2) $(DIR3) $(DIR4) $(DIR5) $(DIR6) $(DIR7) $(DIR8) $(DIR9) $(DIR10) ../debian-style-headers.sh mv *.tgz /drivers Modified: trunk/packages/linux/debian-style-headers.sh =================================================================== --- trunk/packages/linux/debian-style-headers.sh 2007-10-10 13:33:16 UTC (rev 2102) +++ trunk/packages/linux/debian-style-headers.sh 2007-10-10 15:13:35 UTC (rev 2103) @@ -5,7 +5,7 @@ rm -rf "$DSTDIR" mkdir "$DSTDIR" -cp -r .config Makefile Module.symvers .kconfig.d .version .kernelrelease scripts "$DSTDIR" +cp -r .config Makefile Module.symvers .version scripts "$DSTDIR" mkdir -p "$DSTDIR/include" find include -maxdepth 1 | grep -v asm- | xargs '-I{}' cp -r '{}' "$DSTDIR/include" cp -r include/asm-{i386,x86_64,generic} "$DSTDIR/include" Modified: trunk/packages/linux64/Makefile =================================================================== --- trunk/packages/linux64/Makefile 2007-10-10 13:33:16 UTC (rev 2102) +++ trunk/packages/linux64/Makefile 2007-10-10 15:13:35 UTC (rev 2103) @@ -1,5 +1,12 @@ # Linux Kernel Makefile +ifeq ($(CD_ARCH),x86) +CROSS_MAKE= PATH=$$PATH:$(WD)/bin make ARCH=x86_64 CROSS_COMPILE=x86_64-unknown-linux-gnu- +endif +ifeq ($(CD_ARCH),x86_64) +CROSS_MAKE= make +endif + NM= linux VRS= 2.6.22.5 DIR= $(NM)-$(VRS) @@ -53,17 +60,15 @@ URL-$(FILE7)= http://www.linuxfromscratch.org/~alexander/$(FILE7) SHA-$(FILE7)= 3eba4dc8e08ce256280adff492b541bda9c0198b -DIR8= madwifi-0.9.3.2 -FILE8= $(DIR8).tar.bz2 -URL-$(FILE8)= http://easynews.dl.sourceforge.net/sourceforge/madwifi/$(FILE8) -SHA-$(FILE8)= ccd8f4ba267df75ca002d8dbf66b09347e1bc0b6 +# The latest version from +# http://ftp.kernel.org/pub/linux/kernel/people/linville/wireless-2.6/ath5k/ +# does not compile against linux-2.6.22. So here is an old SVN snapshot +# from http://madwifi.org/ -ifeq ($(CD_ARCH),x86) -CROSS_MAKE= PATH=$$PATH:$(WD)/bin make ARCH=x86_64 CROSS_COMPILE=x86_64-unknown-linux-gnu- -endif -ifeq ($(CD_ARCH),x86_64) -CROSS_MAKE= make -endif +DIR8= ath5k-r2701 +FILE8= $(DIR8).tar.gz +URL-$(FILE8)= http://www.linuxfromscratch.org/~alexander/$(FILE8) +SHA-$(FILE8)= d14a002ba192788881ca9a715348f8b7b898fe3c DIR9=rtl-mac80211-20070729 FILE9= $(DIR9).tar.bz2 @@ -124,21 +129,13 @@ patch -Np0 -i ../../$(PATCH2) ; \ $(CROSS_MAKE) KERNDIR=`pwd`/.. ; \ $(CROSS_MAKE) KERNDIR=`pwd`/.. install -ifeq ($(CD_ARCH),x86) tar xf ../$(FILE8) ; cd $(DIR8) ; \ - $(CROSS_MAKE) KERNELPATH=`pwd`/.. modules ; \ - $(CROSS_MAKE) KERNELPATH=`pwd`/.. DESTDIR=`pwd`/DESTDIR-modules install-modules ; \ - cd DESTDIR-modules ; tar zcvf ../../$(DIR8)-kernel-$(VRS)-64bit.tgz . + make KDIR=`pwd`/.. ; make KDIR=`pwd`/.. install +ifeq ($(CD_ARCH),x86) rm /lib/modules/*-64bit/{source,build} cp -v arch/x86_64/boot/bzImage /boot/isolinux/linux64 endif ifeq ($(CD_ARCH),x86_64) - tar xf ../$(FILE8) ; cd $(DIR8) ; \ - $(CROSS_MAKE) BINDIR=/usr/bin MANDIR=/usr/share/man KERNELPATH=`pwd`/.. ; \ - $(CROSS_MAKE) BINDIR=/usr/bin MANDIR=/usr/share/man KERNELPATH=`pwd`/.. DESTDIR=`pwd`/DESTDIR-modules install-modules ; \ - $(CROSS_MAKE) BINDIR=/usr/bin MANDIR=/usr/share/man KERNELPATH=`pwd`/.. DESTDIR=`pwd`/DESTDIR-tools install-tools ; \ - cd DESTDIR-modules ; tar zcvf ../../$(DIR8)-kernel-$(VRS).tgz . ; cd .. ; \ - cd DESTDIR-tools ; tar zcvf ../../$(DIR8)-tools.tgz . cp -v arch/x86_64/boot/bzImage /boot/isolinux/linux rm -rf $(DIR2) $(DIR3) $(DIR4) $(DIR5) $(DIR6) $(DIR7) $(DIR8) $(DIR9) $(DIR10) ../debian-style-headers.sh Modified: trunk/packages/linux64/debian-style-headers.sh =================================================================== --- trunk/packages/linux64/debian-style-headers.sh 2007-10-10 13:33:16 UTC (rev 2102) +++ trunk/packages/linux64/debian-style-headers.sh 2007-10-10 15:13:35 UTC (rev 2103) @@ -5,7 +5,7 @@ rm -rf "$DSTDIR" mkdir "$DSTDIR" -cp -r .config Makefile Module.symvers .kconfig.d .version .kernelrelease scripts "$DSTDIR" +cp -r .config Makefile Module.symvers .version scripts "$DSTDIR" mkdir -p "$DSTDIR/include" find include -maxdepth 1 | grep -v asm- | xargs '-I{}' cp -r '{}' "$DSTDIR/include" cp -r include/asm-{i386,x86_64,generic} "$DSTDIR/include" -- http://linuxfromscratch.org/mailman/listinfo/livecd FAQ: http://www.linuxfromscratch.org/faq/ Unsubscribe: See the above information page
