X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=blobdiff_plain;f=lfs%2Fcompat-wireless;h=66cf8cc471f518a8b83a2d040cd7ceb6bfa56cc1;hp=8fb61c138eed75b85c0d23ef7f66ab2f16e29506;hb=4849218f8fc1ac85090dfe389daeeda39936fedb;hpb=8a21c39670adfafdbdf2e5551b0d9436bb46bea1

diff --git a/lfs/compat-wireless b/lfs/compat-wireless
index 8fb61c138e..66cf8cc471 100644
--- a/lfs/compat-wireless
+++ b/lfs/compat-wireless
@@ -30,7 +30,7 @@ else
 	VERSUFIX=ipfire
 endif
 
-VER        = 2.6.33.2
+VER        = 2.6.34
 
 THISAPP    = compat-wireless-$(VER)
 DL_FILE    = compat-wireless-$(VER).tar.bz2
@@ -46,7 +46,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 24438dddeda05694b94de450893847e3
+$(DL_FILE)_MD5 = 951e15df527eb89f3c9deb752c709fb3
 
 install : $(TARGET)
 
@@ -77,32 +77,30 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar xjf $(DIR_DL)/$(DL_FILE)
 
-	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
-
-	# Set Regulatory Domain to "EU" (use Channel 1-14 max. 20db)
-	echo options cfg80211 ieee80211_regdom=EU > /etc/modprobe.d/cfg80211
-
-	# 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
+	# Enable some USB ID's in rt2800usb driver
+	echo "CONFIG_RT2800USB_RT30XX=y"  >> $(DIR_APP)/config.mk
+	echo "CONFIG_RT2800USB_RT35XX=y"  >> $(DIR_APP)/config.mk
+	echo "CONFIG_RT2800USB_UNKNOWN=y" >> $(DIR_APP)/config.mk
+
+	# Copy USB-Net drivers from Kernel...
+	mkdir $(DIR_APP)/drivers/net/usb/new
+	cp $(DIR_APP)/drivers/net/usb/*.c $(DIR_APP)/drivers/net/usb/new
+	cp /usr/src/linux/drivers/net/usb/{*.c,*.h,Makefile} $(DIR_APP)/drivers/net/usb
+	cp $(DIR_APP)/drivers/net/usb/new/*.c $(DIR_APP)/drivers/net/usb
+
+	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/compat-wireless-2.6.34-usbnet_compile.patch
+
+	cd $(DIR_APP) && make KLIB=/lib/modules/$(KVER)-$(VERSUFIX) \
+		KMODPATH_ARG='INSTALL_MOD_PATH=/lib/modules/$(KVER)-$(VERSUFIX)' KMODDIR=kernel install-modules
+
+	#cd $(DIR_APP) && make KLIB=/lib/modules/$(KVER)-$(VERSUFIX) \
+	#	KMODPATH_ARG='INSTALL_MOD_PATH=/lib/modules/$(KVER)-$(VERSUFIX)' KMODDIR=kernel btinstall
+	#todo check wy maniac has commented this. My system has build it and
+	#we need the ne bt-modules.
+
+	# Install firmware udev files...
+	cd $(DIR_APP)/udev && install -m 644 50-compat_firmware.rules /etc/udev/rules.d/
+	cd $(DIR_APP)/udev && install -m 755 compat_firmware.sh /lib/udev/
 
 	-rm -rf $(DIR_APP)
 	@$(POSTBUILD)