X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=lfs%2Fcompat-wireless;h=60a76c6179839f9bbd6bc39a560a534ab3b98b9e;hb=3fe1243490b163c9db665e577087aa499a9eb292;hp=1cdff0ea127f787eaf567f1781436b5fb995857a;hpb=11c4cfcea8f2176c7ee24faff3d34ccf6afdd5e2;p=people%2Fpmueller%2Fipfire-2.x.git

diff --git a/lfs/compat-wireless b/lfs/compat-wireless
index 1cdff0ea12..60a76c6179 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) 2007-2011  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.37-4-sn
 
 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)
@@ -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 = 6f62b54d22a3c5f8866986173a851506
+$(DL_FILE)_MD5 = be07898fa2e28a06c1b90dd424270ad2
+asix-3.5.0a.tar.bz2_MD5=cc57513505d3ad1a43b58add91d2bba7
 
 install : $(TARGET)
 
@@ -77,32 +83,26 @@ $(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
+	# 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
+
+	# 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/
+
+	# Disable hwcrypt on rt73 ...
+	echo "options rt73usb nohwcrypt=1" > /etc/modprobe.d/ralink_wireless
 
 	-rm -rf $(DIR_APP)
 	@$(POSTBUILD)