X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=blobdiff_plain;f=lfs%2Fcompat-wireless;h=44f0fe9a1ea4c36e21b3cf0ed495fe896e4dccd9;hp=1cdff0ea127f787eaf567f1781436b5fb995857a;hb=31e0e08a59b58622a6ad0b803a589427d01c0f30;hpb=de20524ed3e6aaab52bb3009c807ae3602f8e273

diff --git a/lfs/compat-wireless b/lfs/compat-wireless
index 1cdff0ea12..44f0fe9a1e 100644
--- a/lfs/compat-wireless
+++ b/lfs/compat-wireless
@@ -30,10 +30,10 @@ else
 	VERSUFIX=ipfire
 endif
 
-VER        = 2.6.32.2
+VER        = 2.6.34.1
 
 THISAPP    = compat-wireless-$(VER)
-DL_FILE    = compat-wireless-usbnet_fix-$(VER).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 = 6f62b54d22a3c5f8866986173a851506
+$(DL_FILE)_MD5 = 80ceb675aeba45847258770441352af6
 
 install : $(TARGET)
 
@@ -77,32 +77,25 @@ $(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 # cd /lib/modules/$(uname -r)/kernel/net/ieee80211 && rename .off .ko >> /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=' KMODDIR=kernel install-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)