Readd deletion of ieee80211 modules.

[people/pmueller/ipfire-2.x.git] / lfs / compat-wireless

diff --git a/lfs/compat-wireless b/lfs/compat-wireless
index bc3dd64eb7e69668e80529463227781caab7cb9c..4b63a16ab0d0350b09cf10d80c1949e5b46a304e 100644 (file)
--- a/lfs/compat-wireless
+++ b/lfs/compat-wireless
@@ -24,17 +24,19 @@
 
 include Config
 
-VER        = 2009-03-30
+ifeq "$(XEN)" "1"
+       VERSUFIX=ipfire-xen
+else
+       VERSUFIX=ipfire
+endif
+
+VER        = 2.6.32-rc7
 
 THISAPP    = compat-wireless-$(VER)
 DL_FILE    = $(THISAPP).tar.bz2
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
-ifeq "$(SMP)" ""
-  TARGET     = $(DIR_INFO)/$(THISAPP)-kmod-$(KVER)
-else
-  TARGET     = $(DIR_INFO)/$(THISAPP)-smp
-endif
+TARGET     = $(DIR_INFO)/$(THISAPP)-kmod-$(KVER)-$(VERSUFIX)
 
 ###############################################################################
 # Top-level Rules
@@ -44,7 +46,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 88ea3e5b42ef5fbcec8b91043dd3aa76
+$(DL_FILE)_MD5 = c7b9f081895c23841509a363f9ae4da2
 
 install : $(TARGET)
 
@@ -75,12 +77,18 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar xjf $(DIR_DL)/$(DL_FILE)
 
-#      Apply some wlan-card patches
-       cd $(DIR_APP) && cat $(DIR_SRC)/src/patches/compat-wireless_*.patch | patch -Np1
+       cd $(DIR_APP) && make KLIB=/lib/modules/$(KVER)-$(VERSUFIX) KMODDIR=kernel install-modules
 
-       cd $(DIR_APP) && sed -i -e "s|uname -r|echo $(KVER)-ipfire|g" Makefile
-       cd $(DIR_APP) && sed -i -e "s|/sbin/modprobe|echo|g" Makefile
-       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 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 ieee80211 modules. Because the conflicts with compat-wireless
+       -rm -rf /lib/modules/$(KVER)-$(VERSUFIX)/kernel/net/ieee80211
+
+       -rm -rf $(DIR_APP)
        @$(POSTBUILD)
+