compat-wireless: update to 2.6.39-1-sn.
authorArne Fitzenreiter <arne_f@ipfire.org>
Tue, 24 May 2011 19:17:50 +0000 (21:17 +0200)
committerArne Fitzenreiter <arne_f@ipfire.org>
Tue, 24 May 2011 19:17:50 +0000 (21:17 +0200)
config/kernel/kernel.config.i586-ipfire
config/kernel/kernel.config.i586-ipfire-pae
config/kernel/kernel.config.i586-ipfire-xen
config/rootfiles/common/compat-wireless
config/rootfiles/core/next/update.sh
lfs/compat-wireless
src/patches/compat-wireless-2.6.39_kfifo_module_info.patch [new file with mode: 0644]

index 3fd80c8..43bba22 100644 (file)
@@ -1729,15 +1729,7 @@ CONFIG_IPW2200=m
 # CONFIG_IPW2200_DEBUG is not set
 CONFIG_LIBIPW=m
 # CONFIG_LIBIPW_DEBUG is not set
-CONFIG_IWLWIFI=m
-# CONFIG_IWLWIFI_LEDS is not set
-# CONFIG_IWLWIFI_SPECTRUM_MEASUREMENT is not set
-# CONFIG_IWLWIFI_DEBUG is not set
-CONFIG_IWLAGN=m
-CONFIG_IWL4965=y
-CONFIG_IWL5000=y
-CONFIG_IWL3945=m
-# CONFIG_IWL3945_SPECTRUM_MEASUREMENT is not set
+# CONFIG_IWLWIFI is not set
 CONFIG_HOSTAP=m
 CONFIG_HOSTAP_FIRMWARE=y
 # CONFIG_HOSTAP_FIRMWARE_NVRAM is not set
index 8c7cf4b..f37b655 100644 (file)
@@ -1747,15 +1747,7 @@ CONFIG_IPW2200=m
 # CONFIG_IPW2200_DEBUG is not set
 CONFIG_LIBIPW=m
 # CONFIG_LIBIPW_DEBUG is not set
-CONFIG_IWLWIFI=m
-# CONFIG_IWLWIFI_LEDS is not set
-# CONFIG_IWLWIFI_SPECTRUM_MEASUREMENT is not set
-# CONFIG_IWLWIFI_DEBUG is not set
-CONFIG_IWLAGN=m
-CONFIG_IWL4965=y
-CONFIG_IWL5000=y
-CONFIG_IWL3945=m
-# CONFIG_IWL3945_SPECTRUM_MEASUREMENT is not set
+# CONFIG_IWLWIFI is not set
 CONFIG_HOSTAP=m
 CONFIG_HOSTAP_FIRMWARE=y
 # CONFIG_HOSTAP_FIRMWARE_NVRAM is not set
index e5122a9..fa50c95 100644 (file)
@@ -1525,15 +1525,7 @@ CONFIG_IPW2200=m
 # CONFIG_IPW2200_DEBUG is not set
 CONFIG_LIBIPW=m
 # CONFIG_LIBIPW_DEBUG is not set
-CONFIG_IWLWIFI=m
-# CONFIG_IWLWIFI_LEDS is not set
-# CONFIG_IWLWIFI_SPECTRUM_MEASUREMENT is not set
-# CONFIG_IWLWIFI_DEBUG is not set
-CONFIG_IWLAGN=m
-CONFIG_IWL4965=y
-CONFIG_IWL5000=y
-CONFIG_IWL3945=m
-# CONFIG_IWL3945_SPECTRUM_MEASUREMENT is not set
+# CONFIG_IWLWIFI is not set
 CONFIG_HOSTAP=m
 CONFIG_HOSTAP_FIRMWARE=y
 # CONFIG_HOSTAP_FIRMWARE_NVRAM is not set
index adc4ab3..80018c8 100644 (file)
@@ -1,3 +1,2 @@
-etc/modprobe.d/ralink_wireless
 etc/udev/rules.d/50-compat_firmware.rules
 lib/udev/compat_firmware.sh
index 070a12b..38a1f78 100644 (file)
@@ -81,6 +81,10 @@ echo Unpack the updated files ...
 tar xvf /opt/pakfire/tmp/files --preserve --numeric-owner -C / \
        --no-overwrite-dir
 
+#
+# Enable ralink rt73 hardware encryption again
+rm -f /etc/modprobe.d/ralink_wireless
+
 #
 # Start services
 #
index 22223d7..71f3bc9 100644 (file)
@@ -34,7 +34,7 @@ else
 endif
 endif
 
-VER        = 2.6.38-3-ns
+VER        = 2.6.39-1-sn
 
 THISAPP    = compat-wireless-$(VER)
 DL_FILE    = compat-wireless-$(VER).tar.bz2
@@ -51,7 +51,7 @@ 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 = c4c78d1d41c28f0e9c48ab8098a0a9f2
+$(DL_FILE)_MD5 = ac2b20607d75de8ce2b30b74995383a6
 asix-3.5.0a.tar.bz2_MD5=cc57513505d3ad1a43b58add91d2bba7
 
 install : $(TARGET)
@@ -83,6 +83,9 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar xjf $(DIR_DL)/$(DL_FILE)
 
+       # kfifo has no license info and taints kernel
+       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/compat-wireless-2.6.39_kfifo_module_info.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
@@ -101,8 +104,5 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        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)
diff --git a/src/patches/compat-wireless-2.6.39_kfifo_module_info.patch b/src/patches/compat-wireless-2.6.39_kfifo_module_info.patch
new file mode 100644 (file)
index 0000000..eb5d280
--- /dev/null
@@ -0,0 +1,14 @@
+diff -Naur compat-wireless-2.6.39-1-sn.org/compat/kfifo.c compat-wireless-2.6.39-1-sn/compat/kfifo.c
+--- compat-wireless-2.6.39-1-sn.org/compat/kfifo.c     2011-05-24 01:43:48.000000000 +0200
++++ compat-wireless-2.6.39-1-sn/compat/kfifo.c 2011-05-24 17:20:06.956818313 +0200
+@@ -27,6 +27,10 @@
+ #include <linux/uaccess.h>
+ #include <linux/kfifo.h>
++MODULE_LICENSE("GPL");
++MODULE_AUTHOR("Stefani Seibold <stefani@seibold.net>");
++MODULE_DESCRIPTION("A generic kernel FIFO implementation");
++
+ /*
+  * internal helper to calculate the unused elements in a fifo
+  */