From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Sun, 30 Aug 2009 11:56:55 +0000 (+0200)
Subject: Changed compat-wireless to stable 2.6.31-rc7
X-Git-Tag: v2.5-core31~50^2
X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=commitdiff_plain;h=3fa051a01318bc2c761843a528375d676f0e4c3f;hp=8aa1164863ee6614fb154d460f00fbf092d674df

Changed compat-wireless to stable 2.6.31-rc7
---

diff --git a/doc/packages-list.txt b/doc/packages-list.txt
index e8a1789f0e..fc383fe59d 100644
--- 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
-* 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
diff --git a/lfs/compat-wireless b/lfs/compat-wireless
index 86b489efc1..ebf035f3a7 100644
--- a/lfs/compat-wireless
+++ b/lfs/compat-wireless
@@ -30,7 +30,7 @@ else
 	VERSUFIX=ipfire
 endif
 
-VER        = 2009-08-21
+VER        = 2.6.31-rc7
 
 THISAPP    = compat-wireless-$(VER)
 DL_FILE    = $(THISAPP).tar.bz2
@@ -46,7 +46,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 36193f34a14f1d681bcff7a2db5cf178
+$(DL_FILE)_MD5 = 3b12d104a64a6bdebf8896d54d9ad7bb
 
 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
 
-	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"