Updated compat-wireless (2.6.36-5).

[people/pmueller/ipfire-2.x.git] / lfs / compat-wireless

diff --git a/lfs/compat-wireless b/lfs/compat-wireless
index bc3dd64eb7e69668e80529463227781caab7cb9c..79d8dfed9cb0410bbee64481e9e0d36fd56d2b93 100644 (file)
--- 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,17 +24,23 @@
 
 include Config
 
-VER        = 2009-03-30
+ifeq "$(PAE)" "1"
+       VERSUFIX=ipfire-pae
+else
+ifeq "$(XEN)" "1"
+       VERSUFIX=ipfire-xen
+else
+       VERSUFIX=ipfire
+endif
+endif
+
+VER        = 2.6.36-5-spn
 
 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)
-ifeq "$(SMP)" ""
-  TARGET     = $(DIR_INFO)/$(THISAPP)-kmod-$(KVER)
-else
-  TARGET     = $(DIR_INFO)/$(THISAPP)-smp
-endif
+TARGET     = $(DIR_INFO)/$(THISAPP)-kmod-$(KVER)-$(VERSUFIX)
 
 ###############################################################################
 # Top-level Rules
@@ -44,7 +50,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 88ea3e5b42ef5fbcec8b91043dd3aa76
+$(DL_FILE)_MD5 = 095d00646a44100ba979e8f13746ed86
 
 install : $(TARGET)
 
@@ -75,12 +81,25 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar xjf $(DIR_DL)/$(DL_FILE)
 
-#      Apply some wlan-card patches
-       cd $(DIR_APP) && cat $(DIR_SRC)/src/patches/compat-wireless_*.patch | patch -Np1
+       # 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
+
+       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) \
+               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/
 
-       cd $(DIR_APP) && sed -i -e "s|uname -r|echo $(KVER)-ipfire|g" Makefile
-       cd $(DIR_APP) && sed -i -e "s|/sbin/modprobe|echo|g" Makefile
-       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) && make KMODDIR=kernel install
+       -rm -rf $(DIR_APP)
        @$(POSTBUILD)