Author: alexander
Date: 2007-08-15 09:51:17 -0600 (Wed, 15 Aug 2007)
New Revision: 2024

Modified:
   trunk/doc/README
   trunk/packages/linux/Makefile
   trunk/packages/linux64/Makefile
Log:
Added madwifi


Modified: trunk/doc/README
===================================================================
--- trunk/doc/README    2007-08-15 15:31:48 UTC (rev 2023)
+++ trunk/doc/README    2007-08-15 15:51:17 UTC (rev 2024)
@@ -70,6 +70,9 @@
 (A tool for extracting commands from the Linux From Scratch book and creating
 Makefiles that can download, check and build each LFS package for you.)
 
+You can compile other programs from sources directly on the CD. All locations
+on the CD can be written to (including /usr).
+
 VMWARE ISSUE
 ===========================
 This CD does not detect virtual SCSI disks connected to a virtual machine in
@@ -92,6 +95,18 @@
 type "linux nodhcp" at the boot loader prompt. This may be required for
 wireless connections that utilize WEP or WPA encryption.
 
+Users of wireless cards based on the Atheros chipset have to install the
+proprietary "madwifi" driver. The driver is provided in the precompiled form
+in the /drivers directory (if you loaded the CD contents to RAM, you have to
+mount the CD and look into /media/cdrom/drivers instead). To install it,
+run the following commands:
+
+cd /drivers
+tar -C / -xf madwifi-[version]-kernel-[kernel_version].tgz
+tar -C / -xf madwifi-[version]-tools.tgz
+depmod -ae
+modprobe ath_pci
+
 CONFIGURING X
 ===========================
 The LiveCD attempts to configure X for your video card automatically. The

Modified: trunk/packages/linux/Makefile
===================================================================
--- trunk/packages/linux/Makefile       2007-08-15 15:31:48 UTC (rev 2023)
+++ trunk/packages/linux/Makefile       2007-08-15 15:51:17 UTC (rev 2024)
@@ -53,6 +53,11 @@
 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
+
 # Targets
 
 include $(ROOT)/scripts/functions
@@ -61,7 +66,7 @@
        chroot "$(MP)" $(chenv-blfs) \
        'cd $(ROOT) && make ch-$(NM) $(chbash-post-bash)'
 
-stage2: Makefile $(FILE) $(FILE1) $(FILE2) $(FILE3) $(FILE4) $(FILE5) $(FILE6) 
$(FILE7) $(PATCH1)
+stage2: Makefile $(FILE) $(FILE1) $(FILE2) $(FILE3) $(FILE4) $(FILE5) $(FILE6) 
$(FILE7) $(FILE8) $(PATCH1)
        $(std_build)
 
 compile-stage2:
@@ -81,11 +86,17 @@
        PATH=$$PWD/../fakes-for-fglrx:$$PATH sh ../$(FILE1) --buildpkg 
Slackware/All
        for a in $(DIR2) $(DIR3) $(DIR4) ; do \
            sh ../$$a.run -x ; ../build-nvidia-driver $$a $(VRS) ; done
-       mv *.tgz /drivers
        tar xf ../$(FILE7) ; cd $(DIR7) ; cp ../../config.rt2x00 config ; \
            sed -i '/depmod/d' Makefile ; \
            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 .
+       mv *.tgz /drivers
        cd .. ; ./debian-style-headers.sh $(DIR)
 
 clean:

Modified: trunk/packages/linux64/Makefile
===================================================================
--- trunk/packages/linux64/Makefile     2007-08-15 15:31:48 UTC (rev 2023)
+++ trunk/packages/linux64/Makefile     2007-08-15 15:51:17 UTC (rev 2024)
@@ -53,6 +53,18 @@
 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
+
+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
+
 # Targets
 
 include $(ROOT)/scripts/functions
@@ -61,7 +73,7 @@
        chroot "$(MP)" $(chenv-blfs) \
        'cd $(ROOT) && make ch-$(NM)64 $(chbash-post-bash)'
 
-stage2: Makefile $(FILE) $(FILE1) $(FILE2) $(FILE3) $(FILE4) $(FILE5) $(FILE6) 
$(FILE7) $(PATCH1)
+stage2: Makefile $(FILE) $(FILE1) $(FILE2) $(FILE3) $(FILE4) $(FILE5) $(FILE6) 
$(FILE7) $(FILE8) $(PATCH1)
        $(std_build)
 
 compile-stage2:
@@ -74,40 +86,44 @@
        cp ../config.x86_64 .config
        # Hack for fglrx
        touch include/linux/ioctl32.h
-ifeq ($(CD_ARCH),x86)
-       PATH=$$PATH:$(WD)/bin make ARCH=x86_64 
CROSS_COMPILE=x86_64-unknown-linux-gnu-
-       PATH=$$PATH:$(WD)/bin make modules_install ARCH=x86_64 
CROSS_COMPILE=x86_64-unknown-linux-gnu-
+       $(CROSS_MAKE)
+       $(CROSS_MAKE) modules_install
        sed 's/VERSION/$(VRS)/' ../fakes-for-fglrx/uname.in 
>../fakes-for-fglrx/uname
        sed 's/VERSION/$(VRS)/' ../fakes-for-fglrx/cat.in 
>../fakes-for-fglrx/cat
        chmod 755 ../fakes-for-fglrx/{uname,cat}
+ifeq ($(CD_ARCH),x86)
        PATH=$$PWD/../fakes-for-fglrx:$$PATH sh ../$(FILE1) --buildpkg 
Slackware/Only_Module
        for a in $(DIR2) $(DIR3) $(DIR4) ; do \
            sh ../$$a.run -x ; ../build-nvidia-driver $$a $(VRS)-64bit ; done
-       mv *.tgz /drivers
-       tar xf ../$(FILE7) ; cd $(DIR7) ; cp ../../config.rt2x00 config ; \
-           sed -i '/depmod/d' Makefile ; \
-           patch -Np0 -i ../../$(PATCH2) ; \
-           PATH=$$PATH:$(WD)/bin make KERNDIR=`pwd`/.. ARCH=x86_64 
CROSS_COMPILE=x86_64-unknown-linux-gnu- ; \
-           PATH=$$PATH:$(WD)/bin make KERNDIR=`pwd`/.. ARCH=x86_64 
CROSS_COMPILE=x86_64-unknown-linux-gnu- install
-       rm /lib/modules/*-64bit/{source,build}
-       cp -v arch/x86_64/boot/bzImage /boot/isolinux/linux64
 endif
 ifeq ($(CD_ARCH),x86_64)
-       make
-       make modules_install
-       sed 's/VERSION/$(VRS)/' ../fakes-for-fglrx/uname.in 
>../fakes-for-fglrx/uname
-       sed 's/VERSION/$(VRS)/' ../fakes-for-fglrx/cat.in 
>../fakes-for-fglrx/cat
-       chmod 755 ../fakes-for-fglrx/{uname,cat}
        PATH=$$PWD/../fakes-for-fglrx:$$PATH sh ../$(FILE1) --buildpkg 
Slackware/All
        for a in $(DIR2) $(DIR3) $(DIR4) ; do \
            sh ../$$a.run -x ; ../build-nvidia-driver.native $$a $(VRS)-64bit ; 
done
-       mv *.tgz /drivers
+endif
        tar xf ../$(FILE7) ; cd $(DIR7) ; cp ../../config.rt2x00 config ; \
            sed -i '/depmod/d' Makefile ; \
            patch -Np0 -i ../../$(PATCH2) ; \
-           make KERNDIR=`pwd`/.. ; make KERNDIR=`pwd`/.. install
+           $(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 
.
+       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
 endif
+       mv *.tgz /drivers
 
 clean:
        -rm -rf $(DIR)

-- 
http://linuxfromscratch.org/mailman/listinfo/livecd
FAQ: http://www.linuxfromscratch.org/faq/
Unsubscribe: See the above information page

Reply via email to