X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=lfs%2Fcompat-wireless;h=59bff2907f28e6d98496c8c8f3dbcc656a360351;hb=90874a8a3a372b334ed71d0664b5b11b0f79e255;hp=bece780a9f1c7b2b9ba08147b76022e293b437b7;hpb=591d0154db8b27d31d4b6843ef130bf751b37454;p=ipfire-2.x.git

diff --git a/lfs/compat-wireless b/lfs/compat-wireless
index bece780a9f..59bff2907f 100644
--- a/lfs/compat-wireless
+++ b/lfs/compat-wireless
@@ -30,10 +30,10 @@ else
 	VERSUFIX=ipfire
 endif
 
-VER        = 2.6.32-rc7
+VER        = 2.6.34
 
 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 = c7b9f081895c23841509a363f9ae4da2
+$(DL_FILE)_MD5 = 951e15df527eb89f3c9deb752c709fb3
 
 install : $(TARGET)
 
@@ -77,19 +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
+	# 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
 
-	# 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
+	# 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
 
-	# Set Regulatory Domain to "EU" (use Channel 1-14 max. 20db)
-	echo options cfg80211 ieee80211_regdom=EU > /etc/modprobe.d/cfg80211
+	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/compat-wireless-2.6.34-usbnet_compile.patch
 
-	# Remove ieee80211 modules. Because the conflicts with compat-wireless
-	-rm -rf /lib/modules/$(KVER)-$(VERSUFIX)/kernel/net/ieee80211
+	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)
-
-2dafe9ac35fab4b15fddf09a5302ec75  compat-wireless-2.6.32.2.tar.bz2