X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=blobdiff_plain;f=lfs%2Fcompat-wireless;h=60a76c6179839f9bbd6bc39a560a534ab3b98b9e;hp=5ad94224231bfef3cf4d4060bac05de00285cfb1;hb=a408c745d77ed569da9066ca2c95cda587f327e7;hpb=1e827a986bbdb30913c73bb1c771565c772e3a6a

diff --git a/lfs/compat-wireless b/lfs/compat-wireless
index 5ad9422423..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        = 2009-06-30
+VER        = 2.6.37-4-sn
 
 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 = 68777ce2aa6b28dc3d37fc2b9a3a6d70
+$(DL_FILE)_MD5 = be07898fa2e28a06c1b90dd424270ad2
+asix-3.5.0a.tar.bz2_MD5=cc57513505d3ad1a43b58add91d2bba7
 
 install : $(TARGET)
 
@@ -77,36 +83,26 @@ $(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
+	# 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
 
-#	Build only the modules
-	cd $(DIR_APP) && sed -i -e "s|install: uninstall modules|install: modules|g" Makefile
-	cd $(DIR_APP) && sed -i -e "s|\t@# All the scripts|\nende:|g" Makefile
+	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
+	# Build Updated asix usb-lan driver
+	cd $(DIR_APP)/drivers/net/usb && tar xvf $(DIR_DL)/asix-3.5.0a.tar.bz2
 
-	# 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
+	cd $(DIR_APP) && make KLIB=/lib/modules/$(KVER)-$(VERSUFIX) \
+		KMODPATH_ARG='INSTALL_MOD_PATH=' KMODDIR=kernel install-modules
 
-	# Set Regulatory Domain to "EU" (use Channel 1-14 max. 20db)
-	echo options cfg80211 ieee80211_regdom=EU > /etc/modprobe.d/cfg80211
+	# 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/
 
-	# Remove original kernel rtl818x modules (compat wireless use the
-	# place of newer kernels and so not overwrite it...
-	-rm -rf /lib/modules/$(KVER)-$(VERSUFIX)/kernel/drivers/net/wireless/rtl818?.ko
+	# Disable hwcrypt on rt73 ...
+	echo "options rt73usb nohwcrypt=1" > /etc/modprobe.d/ralink_wireless
 
+	-rm -rf $(DIR_APP)
 	@$(POSTBUILD)
-