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 86b489efc1d3e6a61893826e23892ffbd92c351f..4b63a16ab0d0350b09cf10d80c1949e5b46a304e 100644 (file)
--- a/lfs/compat-wireless
+++ b/lfs/compat-wireless
@@ -30,7 +30,7 @@ else
        VERSUFIX=ipfire
 endif
 
-VER        = 2009-08-21
+VER        = 2.6.32-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 = c7b9f081895c23841509a363f9ae4da2
 
 install : $(TARGET)
 
@@ -77,40 +77,17 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar xjf $(DIR_DL)/$(DL_FILE)
 
-       # Xen
-ifeq "$(XEN)" "1"
-#       some dirty hacks that it is building
-       mv /usr/src/linux/include/linux/tracepoint.h /usr/src/linux/include/linux/tracepoint.h.xen
-       touch /usr/src/linux/include/linux/tracepoint.h
-       cd /usr/src/ &&  patch -Np1 < $(DIR_SRC)/src/patches/compat-xen-1.patch
-endif
-
-#      Apply some wlan-card patches
-       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/compat-wireless_rt2500pci-skb_allignment.patch
-
-#      Enable B43 NPHY / PHY_LP
-       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
 
-       # Xen
-ifeq "$(XEN)" "1"
-#       remove dirty hacks. restores to the status before the dirty hacks
-       cd /usr/src/ &&  patch -Np1 < $(DIR_SRC)/src/patches/compat-xen-2.patch
-       mv /usr/src/linux/include/linux/tracepoint.h.xen /usr/src/linux/include/linux/tracepoint.h
-endif
-
        # Set Regulatory Domain to "EU" (use Channel 1-14 max. 20db)
        echo options cfg80211 ieee80211_regdom=EU > /etc/modprobe.d/cfg80211
 
-       # Remove original kernel rtl818x modules (compat wireless use the
-       # place of newer kernels and so not overwrite it...
-       -rm -rf /lib/modules/$(KVER)-$(VERSUFIX)/kernel/drivers/net/wireless/rtl818?.ko
+       # Remove ieee80211 modules. Because the conflicts with compat-wireless
+       -rm -rf /lib/modules/$(KVER)-$(VERSUFIX)/kernel/net/ieee80211
 
        -rm -rf $(DIR_APP)
        @$(POSTBUILD)