X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=lfs%2Fcompat-wireless;h=a4c2197ed34c3105f38e4fbd5f85ee362f22c883;hb=fae0d5e39422c860c22217bf5cb1afc6e09a0c20;hp=41efffcb5334465889bf01846d2ea8fcdd2dc718;hpb=ee09e47e6da5d6934bce8dc676a9e81f0fc105f3;p=people%2Fpmueller%2Fipfire-2.x.git

diff --git a/lfs/compat-wireless b/lfs/compat-wireless
index 41efffcb53..a4c2197ed3 100644
--- a/lfs/compat-wireless
+++ b/lfs/compat-wireless
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2008  Michael Tremer & Christian Schmidt                      #
+# Copyright (C) 2010  IPFire Team <info@ipfire.org>                           #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
@@ -24,16 +24,20 @@
 
 include Config
 
+ifeq "$(PAE)" "1"
+	VERSUFIX=ipfire-pae
+else
 ifeq "$(XEN)" "1"
 	VERSUFIX=ipfire-xen
 else
 	VERSUFIX=ipfire
 endif
+endif
 
-VER        = 2.6.32.2
+VER        = 2.6.35-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)
@@ -42,11 +46,13 @@ TARGET     = $(DIR_INFO)/$(THISAPP)-kmod-$(KVER)-$(VERSUFIX)
 # Top-level Rules
 ###############################################################################
 
-objects = $(DL_FILE)
+objects = $(DL_FILE) asix-3.5.0a.tar.bz2
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
+asix-3.5.0a.tar.bz2 = $(DL_FROM)/asix-3.5.0a.tar.bz2
 
-$(DL_FILE)_MD5 = 2dafe9ac35fab4b15fddf09a5302ec75
+$(DL_FILE)_MD5 = 41c51280e5aa140c62a2a9871e2ae505
+asix-3.5.0a.tar.bz2_MD5=cc57513505d3ad1a43b58add91d2bba7
 
 install : $(TARGET)
 
@@ -77,18 +83,29 @@ $(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
+	# 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
 
-	# 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
+	# Build Updated asix usb-lan driver
+	cd $(DIR_APP)/drivers/net/usb && tar xvf $(DIR_DL)/asix-3.5.0a.tar.bz2
+
+	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)
-