Cleanup: removed unused patches.

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

diff --git a/lfs/compat-wireless b/lfs/compat-wireless
index 6a2d23d40c74b4a17100766bed31ea73e3c736c7..8fb61c138eed75b85c0d23ef7f66ab2f16e29506 100644 (file)
--- a/lfs/compat-wireless
+++ b/lfs/compat-wireless
@@ -30,10 +30,10 @@ else
        VERSUFIX=ipfire
 endif
 
-VER        = 2009-07-15
+VER        = 2.6.33.2
 
 THISAPP    = compat-wireless-$(VER)
-DL_FILE    = $(THISAPP).tar.bz2
+DL_FILE    = compat-wireless-$(VER).tar.bz2
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)-kmod-$(KVER)-$(VERSUFIX)
@@ -46,7 +46,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = e1201ab3833e0057bfe760b625bb19e8
+$(DL_FILE)_MD5 = 24438dddeda05694b94de450893847e3
 
 install : $(TARGET)
 
@@ -77,20 +77,32 @@ $(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) && patch -Np1 < $(DIR_SRC)/src/patches/compat-wireless_rt2500pci-skb_allignment.patch
+       cd $(DIR_APP) && make KLIB=/lib/modules/$(KVER)-$(VERSUFIX) KMODDIR=kernel install-modules
 
-#      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
+       # 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 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
-
+       # Rename ieee80211 modules Because the conflicts with compat-wireless
+       -cd /lib/modules/$(KVER)-$(VERSUFIX)/kernel/net/ieee80211 && rename .ko .off *
+
+       echo "# If you want to use hostap (prism drivers)" > /etc/modprobe.d/hostap
+       echo "# you must rename the ieee80211 modules. Run:" >> /etc/modprobe.d/hostap
+       echo "# rename .off .ko /lib/modules/*/kernel/net/ieee80211/*" >> /etc/modprobe.d/hostap
+       echo "# depmod -a" >> /etc/modprobe.d/hostap
+       echo >> /etc/modprobe.d/hostap
+       echo "# additional you need to blacklist the orinoco modules" >> /etc/modprobe.d/hostap
+       echo "# by uncommenting following lines" >> /etc/modprobe.d/hostap
+       echo >> /etc/modprobe.d/hostap
+       echo "#blacklist orinoco" >> /etc/modprobe.d/hostap
+       echo "#blacklist orinoco_cs" >> /etc/modprobe.d/hostap
+       echo "#blacklist orinoco_plx" >> /etc/modprobe.d/hostap
+       echo "#blacklist orinoco_pci" >> /etc/modprobe.d/hostap
+       echo "#blacklist orinoco_tmd" >> /etc/modprobe.d/hostap
+       echo "#blacklist orinoco_nortel" >> /etc/modprobe.d/hostap
+
+       -rm -rf $(DIR_APP)
        @$(POSTBUILD)