Changed compat-wireless to stable 2.6.31-rc7

diff --git a/doc/packages-list.txt b/doc/packages-list.txt
index e8a1789f0e1bbfe6c903c80ea1c6f59df70ece17..fc383fe59d88254c724b383075eee1c5f709191d 100644 (file)
--- a/doc/packages-list.txt
+++ b/doc/packages-list.txt
@@ -68,7 +68,7 @@
 * clamav-0.95.2
 * cmake-2.4.8
 * collectd-4.5.3
 * clamav-0.95.2
 * cmake-2.4.8
 * collectd-4.5.3

-* compat-wireless-2009-08-21-kmod-2.6.27.31-ipfire
+* compat-wireless-2.6.31-rc7-kmod-2.6.27.31-ipfire

 * coreutils-5.96
 * cpio-2.6
 * cpufrequtils-005
 * coreutils-5.96
 * cpio-2.6
 * cpufrequtils-005

diff --git a/lfs/compat-wireless b/lfs/compat-wireless
index 86b489efc1d3e6a61893826e23892ffbd92c351f..ebf035f3a7c4629b0b8d2a75010915bf2fc16f3a 100644 (file)
--- a/lfs/compat-wireless
+++ b/lfs/compat-wireless
@@ -30,7 +30,7 @@ else
        VERSUFIX=ipfire
 endif
 
        VERSUFIX=ipfire
 endif
 

-VER        = 2009-08-21
+VER        = 2.6.31-rc7

 
 THISAPP    = compat-wireless-$(VER)
 DL_FILE    = $(THISAPP).tar.bz2
 
 THISAPP    = compat-wireless-$(VER)
 DL_FILE    = $(THISAPP).tar.bz2


@@ -46,7 +46,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 

-$(DL_FILE)_MD5 = 36193f34a14f1d681bcff7a2db5cf178
+$(DL_FILE)_MD5 = 3b12d104a64a6bdebf8896d54d9ad7bb

 
 install : $(TARGET)
 
 
 install : $(TARGET)
 


@@ -92,11 +92,21 @@ endif
        echo "CONFIG_B43_NPHY=y" >> $(DIR_APP)/config.mk
        echo "CONFIG_B43_PHY_LP=y" >> $(DIR_APP)/config.mk
 
        echo "CONFIG_B43_NPHY=y" >> $(DIR_APP)/config.mk
        echo "CONFIG_B43_PHY_LP=y" >> $(DIR_APP)/config.mk
 

-       cd $(DIR_APP) && make KLIB=/lib/modules/$(KVER)-$(VERSUFIX) KMODDIR=kernel install-modules

 
 

-       # The makefile put the modules to a wrong place move back...
-       cp -rf /lib/modules/$(KVER)-$(VERSUFIX)/lib /
-       rm -rf /lib/modules/$(KVER)-$(VERSUFIX)/lib
+       # This is for stable version
+       # Build only the modules
+       cd $(DIR_APP) && sed -i -e "s|install: uninstall modules|install: modules|g" Makefile
+       cd $(DIR_APP) && sed -i -e "s|\t@# All the scripts|\nende:|g" Makefile
+
+       cd $(DIR_APP) && make KLIB=/lib/modules/$(KVER)-$(VERSUFIX) KMODDIR=kernel install
+
+
+       # This is for new developer versions (New makefile)
+       #       cd $(DIR_APP) && make KLIB=/lib/modules/$(KVER)-$(VERSUFIX) KMODDIR=kernel install-modules
+
+       #       # The makefile put the modules to a wrong place move back...
+       #       cp -rf /lib/modules/$(KVER)-$(VERSUFIX)/lib /
+       #       rm -rf /lib/modules/$(KVER)-$(VERSUFIX)/lib

 
        # Xen
 ifeq "$(XEN)" "1"
 
        # Xen
 ifeq "$(XEN)" "1"