X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=blobdiff_plain;f=lfs%2Fcompat-wireless;h=8fb61c138eed75b85c0d23ef7f66ab2f16e29506;hp=5d1bff17e22471d0795a17feb145627c6e9b178e;hb=00567147f9e35983cba0f896a8f3af0995fc9b26;hpb=4d573fcc33ad658d458c14813201b88b7cc3f9e1

diff --git a/lfs/compat-wireless b/lfs/compat-wireless
index 5d1bff17e2..8fb61c138e 100644
--- a/lfs/compat-wireless
+++ b/lfs/compat-wireless
@@ -30,10 +30,10 @@ else
 	VERSUFIX=ipfire
 endif
 
-VER        = 2009-05-30
+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 = 1f3924b3bf450713a88422e63c7481a3
+$(DL_FILE)_MD5 = 24438dddeda05694b94de450893847e3
 
 install : $(TARGET)
 
@@ -77,52 +77,32 @@ $(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
-
-
-	# 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
+	cd $(DIR_APP) && make KLIB=/lib/modules/$(KVER)-$(VERSUFIX) KMODDIR=kernel install-modules
 
-
-	# 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"
-#       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
+	# 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
+	# 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)
-