Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next

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

diff --git a/lfs/compat-wireless b/lfs/compat-wireless
index 78bd1d4aa09974116ffa956047e5146c80a9843c..9ce6f07593c81698f6ce1427e4eb34c5166e94cc 100644 (file)
--- a/lfs/compat-wireless
+++ b/lfs/compat-wireless
@@ -26,10 +26,10 @@ include Config
 
 VERSUFIX=ipfire$(KCFG)
 
-VER        = 3.5.1-1-snpc
+VER        = 3.6.8-1-snp
 
 ifeq "$(KCFG)" "-xen"
-       KVER = 2.6.32.59
+       KVER = 2.6.32.60
 endif
 
 THISAPP    = compat-wireless-$(VER)
@@ -47,7 +47,7 @@ objects = $(DL_FILE) asix-4.4.0.tar.xz
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 asix-4.4.0.tar.xz = $(DL_FROM)/asix-4.4.0.tar.xz
 
-$(DL_FILE)_MD5 = eea8d1c430ad38b713457438e04f47f5
+$(DL_FILE)_MD5 = 4120bc9841d6a1b5b92af34103f16a06
 asix-4.4.0.tar.xz_MD5=633609e889de41554826e0e2cd7bffde
 
 install : $(TARGET)
@@ -85,6 +85,9 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        # Codel patches
        cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/compat-wireless_codel-avoid-a-nul-rec_inv_sqrt.patch
 
+       # compat-3.1 include a bogus cpufreq_backort
+       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/compat-wireless-3.6.8-remove_3.1_cpufreq_backport.patch
+
        # Build ath5k only if target has pci
        cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/compat-wireless-3.5-build_ath5k_only_with_pci.patch
 
@@ -116,7 +119,7 @@ endif
                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 644 50-compat_firmware.rules /lib/udev/rules.d/
        cd $(DIR_APP)/udev && install -m 755 compat_firmware.sh /lib/udev/
 
        -rm -rf $(DIR_APP)