X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=blobdiff_plain;f=lfs%2Fcompat-wireless;h=3b08ddaaa51b18d4c13195892bdba04b6f91a7de;hp=37e7fcf231ed92396fb3905013d11028510b49e9;hb=0108e6eeebe3a89455792f2faa93b90e3fab370c;hpb=6ba42a71f61046d6d733d8a0f4c6b59dc166fa68

diff --git a/lfs/compat-wireless b/lfs/compat-wireless
index 37e7fcf231..3b08ddaaa5 100644
--- a/lfs/compat-wireless
+++ b/lfs/compat-wireless
@@ -30,10 +30,10 @@ else
 	VERSUFIX=ipfire
 endif
 
-VER        = 2.6.32-rc6
+VER        = 2.6.36-rc3-1
 
 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 = 4c8eafa1c35d1ab9ca6fa66974abd802
+$(DL_FILE)_MD5 = c800a7d8063adc420dc6756ca92275e4
 
 install : $(TARGET)
 
@@ -77,44 +77,25 @@ $(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 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
 
-#	Enable B43 NPHY / PHY_LP
-	echo "CONFIG_B43_NPHY=y" >> $(DIR_APP)/config.mk
-	echo "CONFIG_B43_PHY_LP=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) KMODDIR=kernel install-modules
+	cd $(DIR_APP) && make KLIB=/lib/modules/$(KVER)-$(VERSUFIX) \
+		KMODPATH_ARG='INSTALL_MOD_PATH=' 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
-
-	# 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
-	-rm -rf /lib/modules/$(KVER)-$(VERSUFIX)/kernel/net/ieee80211
+	# 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)
-