r2061 - in trunk/packages: linux linux64

alexander at linuxfromscratch.org alexander at linuxfromscratch.org
Sun Sep 16 07:38:22 MDT 2007 

Author: alexander
Date: 2007-09-16 07:38:22 -0600 (Sun, 16 Sep 2007)
New Revision: 2061

Modified:
   trunk/packages/linux/Makefile
   trunk/packages/linux/config.x86
   trunk/packages/linux64/Makefile
   trunk/packages/linux64/config.x86_64
Log:
Added a driver for wireless cards by Realtek.

Removed the kernel option for PnP EIDE devices, because this breaks
"hda=remap63" parameter, and these devices can be found even without this
option at the standard IDE ports. The issue has been reported by Martin Miehe.



Modified: trunk/packages/linux/Makefile
===================================================================
--- trunk/packages/linux/Makefile	2007-09-16 06:51:29 UTC (rev 2060)
+++ trunk/packages/linux/Makefile	2007-09-16 13:38:22 UTC (rev 2061)
@@ -58,6 +58,12 @@
 URL-$(FILE8)= http://easynews.dl.sourceforge.net/sourceforge/madwifi/$(FILE8)
 SHA-$(FILE8)= ccd8f4ba267df75ca002d8dbf66b09347e1bc0b6
 
+DIR9=rtl-mac80211-20070729
+FILE9= $(DIR9).tar.bz2
+URL-$(FILE9)= http://www.hauke-m.de/fileadmin/rtl-wifi/$(FILE9)
+SHA-$(FILE9)= 001787fe6556cdfe02ec77665e83f7747d71b953
+
+
 # Targets
 
 include $(ROOT)/scripts/functions
@@ -66,7 +72,7 @@
 	chroot "$(MP)" $(chenv-blfs) \
 	'cd $(ROOT) && make ch-$(NM) $(chbash-post-bash)'
 
-stage2: Makefile $(FILE) $(FILE1) $(FILE2) $(FILE3) $(FILE4) $(FILE5) $(FILE6) $(FILE7) $(FILE8) $(PATCH1)
+stage2: Makefile $(FILE) $(FILE1) $(FILE2) $(FILE3) $(FILE4) $(FILE5) $(FILE6) $(FILE7) $(FILE8) $(FILE9) $(PATCH1)
 	$(std_build)
 
 compile-stage2:
@@ -86,8 +92,14 @@
 	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
-	tar xf ../$(FILE7) ; cd $(DIR7) ; cp ../../config.rt2x00 config ; \
+	# both rtl8187 and rt2x00 build eeprom_93cx6.ko and thus conflict
+	# so we have to hack the build
+	tar xf ../$(FILE7) ; tar xf ../$(FILE9) ; cd $(DIR7) ; \
+	    cp ../../config.rt2x00 config ; cp ../$(DIR9)/rtl* . ; \
+	    sed -i 's@"eeprom_93cx6.h"@<linux/eeprom_93cx6.h>@' rtl8187_dev.c ; \
 	    sed -i '/depmod/d' Makefile ; \
+	    echo "obj-m += rtl8187.o" >>Makefile ; \
+	    echo "rtl8187-objs := rtl8187_dev.o rtl8187_rtl8225.o" >>Makefile ; \
 	    patch -Np0 -i ../../$(PATCH2) ; make KERNDIR=`pwd`/.. ; \
 	    make KERNDIR=`pwd`/.. install
 	tar xf ../$(FILE8) ; cd $(DIR8) ; \

Modified: trunk/packages/linux/config.x86
===================================================================
--- trunk/packages/linux/config.x86	2007-09-16 06:51:29 UTC (rev 2060)
+++ trunk/packages/linux/config.x86	2007-09-16 13:38:22 UTC (rev 2061)
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.22.2
-# Wed Aug 15 17:47:27 2007
+# Linux kernel version: 2.6.22.5
+# Sun Sep 16 11:49:44 2007
 #
 CONFIG_X86_32=y
 CONFIG_GENERIC_TIME=y
@@ -362,8 +362,6 @@
 CONFIG_INET=y
 CONFIG_IP_MULTICAST=y
 # CONFIG_IP_ADVANCED_ROUTER is not set
-# CONFIG_ASK_IP_FIB_HASH is not set
-# CONFIG_IP_FIB_TRIE is not set
 CONFIG_IP_FIB_HASH=y
 # CONFIG_IP_PNP is not set
 # CONFIG_NET_IPIP is not set
@@ -383,12 +381,6 @@
 CONFIG_INET_TCP_DIAG=m
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-# CONFIG_DEFAULT_BIC is not set
-# CONFIG_DEFAULT_CUBIC is not set
-# CONFIG_DEFAULT_HTCP is not set
-# CONFIG_DEFAULT_VEGAS is not set
-# CONFIG_DEFAULT_WESTWOOD is not set
-# CONFIG_DEFAULT_RENO is not set
 CONFIG_DEFAULT_TCP_CONG="cubic"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IP_VS is not set
@@ -732,7 +724,7 @@
 CONFIG_IDE_GENERIC=m
 CONFIG_BLK_DEV_CMD640=y
 # CONFIG_BLK_DEV_CMD640_ENHANCED is not set
-CONFIG_BLK_DEV_IDEPNP=y
+# CONFIG_BLK_DEV_IDEPNP is not set
 CONFIG_BLK_DEV_IDEPCI=y
 CONFIG_IDEPCI_SHARE_IRQ=y
 # CONFIG_IDEPCI_PCIBUS_ORDER is not set

Modified: trunk/packages/linux64/Makefile
===================================================================
--- trunk/packages/linux64/Makefile	2007-09-16 06:51:29 UTC (rev 2060)
+++ trunk/packages/linux64/Makefile	2007-09-16 13:38:22 UTC (rev 2061)
@@ -65,6 +65,12 @@
 CROSS_MAKE= make
 endif
 
+DIR9=rtl-mac80211-20070729
+FILE9= $(DIR9).tar.bz2
+URL-$(FILE9)= http://www.hauke-m.de/fileadmin/rtl-wifi/$(FILE9)
+SHA-$(FILE9)= 001787fe6556cdfe02ec77665e83f7747d71b953
+
+
 # Targets
 
 include $(ROOT)/scripts/functions
@@ -73,7 +79,7 @@
 	chroot "$(MP)" $(chenv-blfs) \
 	'cd $(ROOT) && make ch-$(NM)64 $(chbash-post-bash)'
 
-stage2: Makefile $(FILE) $(FILE1) $(FILE2) $(FILE3) $(FILE4) $(FILE5) $(FILE6) $(FILE7) $(FILE8) $(PATCH1)
+stage2: Makefile $(FILE) $(FILE1) $(FILE2) $(FILE3) $(FILE4) $(FILE5) $(FILE6) $(FILE7) $(FILE8) $(FILE9) $(PATCH1)
 	$(std_build)
 
 compile-stage2:
@@ -101,8 +107,14 @@
 	for a in $(DIR2) $(DIR3) $(DIR4) ; do \
 	    sh ../$$a.run -x ; ../build-nvidia-driver.native $$a $(VRS)-64bit ; done
 endif
-	tar xf ../$(FILE7) ; cd $(DIR7) ; cp ../../config.rt2x00 config ; \
+	# both rtl8187 and rt2x00 build eeprom_93cx6.ko and thus conflict
+	# so we have to hack the build
+	tar xf ../$(FILE7) ; tar xf ../$(FILE9) ; cd $(DIR7) ; \
+	    cp ../../config.rt2x00 config ; cp ../$(DIR9)/rtl* . ; \
+	    sed -i 's@"eeprom_93cx6.h"@<linux/eeprom_93cx6.h>@' rtl8187_dev.c ; \
 	    sed -i '/depmod/d' Makefile ; \
+	    echo "obj-m += rtl8187.o" >>Makefile ; \
+	    echo "rtl8187-objs := rtl8187_dev.o rtl8187_rtl8225.o" >>Makefile ; \
 	    patch -Np0 -i ../../$(PATCH2) ; \
 	    $(CROSS_MAKE) KERNDIR=`pwd`/.. ; \
 	    $(CROSS_MAKE) KERNDIR=`pwd`/.. install

Modified: trunk/packages/linux64/config.x86_64
===================================================================
--- trunk/packages/linux64/config.x86_64	2007-09-16 06:51:29 UTC (rev 2060)
+++ trunk/packages/linux64/config.x86_64	2007-09-16 13:38:22 UTC (rev 2061)
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.22.2
-# Wed Aug 15 17:47:27 2007
+# Linux kernel version: 2.6.22.5
+# Sun Sep 16 12:07:06 2007
 #
 CONFIG_X86_64=y
 CONFIG_64BIT=y
@@ -303,8 +303,6 @@
 CONFIG_INET=y
 CONFIG_IP_MULTICAST=y
 # CONFIG_IP_ADVANCED_ROUTER is not set
-# CONFIG_ASK_IP_FIB_HASH is not set
-# CONFIG_IP_FIB_TRIE is not set
 CONFIG_IP_FIB_HASH=y
 # CONFIG_IP_PNP is not set
 # CONFIG_NET_IPIP is not set
@@ -324,12 +322,6 @@
 CONFIG_INET_TCP_DIAG=m
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-# CONFIG_DEFAULT_BIC is not set
-# CONFIG_DEFAULT_CUBIC is not set
-# CONFIG_DEFAULT_HTCP is not set
-# CONFIG_DEFAULT_VEGAS is not set
-# CONFIG_DEFAULT_WESTWOOD is not set
-# CONFIG_DEFAULT_RENO is not set
 CONFIG_DEFAULT_TCP_CONG="cubic"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IP_VS is not set
@@ -710,7 +702,7 @@
 CONFIG_IDE_GENERIC=m
 CONFIG_BLK_DEV_CMD640=y
 # CONFIG_BLK_DEV_CMD640_ENHANCED is not set
-CONFIG_BLK_DEV_IDEPNP=y
+# CONFIG_BLK_DEV_IDEPNP is not set
 CONFIG_BLK_DEV_IDEPCI=y
 CONFIG_IDEPCI_SHARE_IRQ=y
 # CONFIG_IDEPCI_PCIBUS_ORDER is not set
@@ -1883,7 +1875,7 @@
 # CONFIG_JBD_DEBUG is not set
 CONFIG_JBD2=m
 # CONFIG_JBD2_DEBUG is not set
-CONFIG_REISER4_FS=m                                                           
+CONFIG_REISER4_FS=m
 # CONFIG_REISER4_DEBUG is not set
 CONFIG_REISERFS_FS=m
 # CONFIG_REISERFS_CHECK is not set

More information about the livecd mailing list