From f793992b717349a28425642b3b61bc752fc53949 Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Tue, 24 May 2011 21:17:50 +0200 Subject: [PATCH] compat-wireless: update to 2.6.39-1-sn. --- config/kernel/kernel.config.i586-ipfire | 10 +--------- config/kernel/kernel.config.i586-ipfire-pae | 10 +--------- config/kernel/kernel.config.i586-ipfire-xen | 10 +--------- config/rootfiles/common/compat-wireless | 1 - config/rootfiles/core/next/update.sh | 4 ++++ lfs/compat-wireless | 10 +++++----- .../compat-wireless-2.6.39_kfifo_module_info.patch | 14 ++++++++++++++ 7 files changed, 26 insertions(+), 33 deletions(-) create mode 100644 src/patches/compat-wireless-2.6.39_kfifo_module_info.patch diff --git a/config/kernel/kernel.config.i586-ipfire b/config/kernel/kernel.config.i586-ipfire index 3fd80c8864..43bba22376 100644 --- a/config/kernel/kernel.config.i586-ipfire +++ b/config/kernel/kernel.config.i586-ipfire @@ -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 diff --git a/config/kernel/kernel.config.i586-ipfire-pae b/config/kernel/kernel.config.i586-ipfire-pae index 8c7cf4b7d1..f37b6552c6 100644 --- a/config/kernel/kernel.config.i586-ipfire-pae +++ b/config/kernel/kernel.config.i586-ipfire-pae @@ -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 diff --git a/config/kernel/kernel.config.i586-ipfire-xen b/config/kernel/kernel.config.i586-ipfire-xen index e5122a97d2..fa50c95435 100644 --- a/config/kernel/kernel.config.i586-ipfire-xen +++ b/config/kernel/kernel.config.i586-ipfire-xen @@ -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 diff --git a/config/rootfiles/common/compat-wireless b/config/rootfiles/common/compat-wireless index adc4ab3339..80018c84d1 100644 --- a/config/rootfiles/common/compat-wireless +++ b/config/rootfiles/common/compat-wireless @@ -1,3 +1,2 @@ -etc/modprobe.d/ralink_wireless etc/udev/rules.d/50-compat_firmware.rules lib/udev/compat_firmware.sh diff --git a/config/rootfiles/core/next/update.sh b/config/rootfiles/core/next/update.sh index 070a12b740..38a1f7821a 100644 --- a/config/rootfiles/core/next/update.sh +++ b/config/rootfiles/core/next/update.sh @@ -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 # diff --git a/lfs/compat-wireless b/lfs/compat-wireless index 22223d7d7a..71f3bc9f31 100644 --- a/lfs/compat-wireless +++ b/lfs/compat-wireless @@ -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 index 0000000000..eb5d2806b6 --- /dev/null +++ b/src/patches/compat-wireless-2.6.39_kfifo_module_info.patch @@ -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 + #include + ++MODULE_LICENSE("GPL"); ++MODULE_AUTHOR("Stefani Seibold "); ++MODULE_DESCRIPTION("A generic kernel FIFO implementation"); ++ + /* + * internal helper to calculate the unused elements in a fifo + */ -- 2.39.2