X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=blobdiff_plain;f=lfs%2Fcompat-wireless;h=466add2eec4f7a818082ac501996d0cf5777279a;hp=3364b40dbe359b208a6d258c07fe01153ae0f534;hb=4fbd28efc59f7bc864449c987e30c02eaa40675a;hpb=3934c8b7dfe8107d9598d0a550f76b1e386407a2

diff --git a/lfs/compat-wireless b/lfs/compat-wireless
index 3364b40dbe..466add2eec 100644
--- a/lfs/compat-wireless
+++ b/lfs/compat-wireless
@@ -30,7 +30,7 @@ else
 	VERSUFIX=ipfire
 endif
 
-VER        = 2009-06-30
+VER        = 2.6.32-rc6
 
 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 = 68777ce2aa6b28dc3d37fc2b9a3a6d70
+$(DL_FILE)_MD5 = 4c8eafa1c35d1ab9ca6fa66974abd802
 
 install : $(TARGET)
 
@@ -80,12 +80,21 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 #	Apply some wlan-card patches
 	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/compat-wireless_rt2500pci-skb_allignment.patch
 
-#	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-modules
 
-	cd $(DIR_APP) && make KLIB=/lib/modules/$(KVER)-$(VERSUFIX) KMODDIR=kernel install
+	# 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
 
 	# Set Regulatory Domain to "EU" (use Channel 1-14 max. 20db)
 	echo options cfg80211 ieee80211_regdom=EU > /etc/modprobe.d/cfg80211
+
+	# Remove original kernel modules (compat wireless use the
+	# place of newer kernels and so not overwrite it...)
+	-rm -rf /lib/modules/$(KVER)-$(VERSUFIX)/kernel/drivers/net/wireless/ath?k
+	-rm -rf /lib/modules/$(KVER)-$(VERSUFIX)/kernel/drivers/net/wireless/rtl818?.ko
+	-rm -rf /lib/modules/$(KVER)-$(VERSUFIX)/kernel/net/ieee80211
+
+	-rm -rf $(DIR_APP)
 	@$(POSTBUILD)
+