compat-wireless: fix for legacy xen kernel.

diff --git a/config/rootfiles/core/66/update.sh b/config/rootfiles/core/66/update.sh
index 97fcf8f3bdfd35f8596f61425f9c7a5631f8fa68..c76f3c728d5814852cd3e8c9c242e2bb13b53639 100644 (file)
--- a/config/rootfiles/core/66/update.sh
+++ b/config/rootfiles/core/66/update.sh
@@ -329,7 +329,7 @@ fi
 if [ -e "/opt/pakfire/db/installed/meta-linux-xen" ]; then
        echo "Name: linux-xen" > /opt/pakfire/db/installed/meta-linux-xen
        echo "ProgVersion: 2.6.32.60" >> /opt/pakfire/db/installed/meta-linux-xen
-       echo "Release: 23"     >> /opt/pakfire/db/installed/meta-linux-xen
+       echo "Release: 24"     >> /opt/pakfire/db/installed/meta-linux-xen
        # Add xvc0 to /etc/securetty
        echo "xvc0" >> /etc/securetty
 fi

diff --git a/lfs/compat-wireless b/lfs/compat-wireless
index 8a3fd56ebb8ce5b90e08d513f27ca3a1158dbcbc..9ce6f07593c81698f6ce1427e4eb34c5166e94cc 100644 (file)
--- a/lfs/compat-wireless
+++ b/lfs/compat-wireless
@@ -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
 

diff --git a/lfs/linux2 b/lfs/linux2
index 45040356b0ed1436eb3f997cc8f3257bb6ff5840..a412d9eb2eae4f3a40d526eb3f24ea3ff75aa7e4 100644 (file)
--- a/lfs/linux2
+++ b/lfs/linux2
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2012  IPFire Team <info@ipfire.org>                      #
+# Copyright (C) 2007-2013  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        #
@@ -34,7 +34,7 @@ DIR_APP    = $(DIR_SRC)/$(THISAPP)
 CFLAGS     =
 CXXFLAGS   =
 
-PAK_VER    = 24
+PAK_VER    = 25
 DEPS      = ""
 
 # Normal build or XEN build.

diff --git a/src/patches/compat-wireless-3.6.8-remove_3.1_cpufreq_backport.patch b/src/patches/compat-wireless-3.6.8-remove_3.1_cpufreq_backport.patch
new file mode 100644 (file)
index 0000000..602c153
--- /dev/null
+++ b/src/patches/compat-wireless-3.6.8-remove_3.1_cpufreq_backport.patch
@@ -0,0 +1,48 @@
+diff -Naur compat-wireless-3.6.8-1-snp.org/compat/compat-3.1.c compat-wireless-3.6.8-1-snp/compat/compat-3.1.c
+--- compat-wireless-3.6.8-1-snp.org/compat/compat-3.1.c        2012-11-29 06:03:45.000000000 +0100
++++ compat-wireless-3.6.8-1-snp/compat/compat-3.1.c    2013-01-18 16:50:08.799491784 +0100
+@@ -9,30 +9,6 @@
+  */
+ 
+ #include <linux/idr.h>
+-#include <linux/cpufreq.h>
+-
+-/* This backports:
+- * commit 3d73710880afa3d61cf57b5d4eb192e812eb7e4f
+- * Author: Jesse Barnes <jbarnes@virtuousgeek.org>
+- * Date:   Tue Jun 28 10:59:12 2011 -0700
+- *
+- *    cpufreq: expose a cpufreq_quick_get_max routine
+- */
+-
+-unsigned int compat_cpufreq_quick_get_max(unsigned int cpu)
+-{
+-      struct cpufreq_policy *policy = cpufreq_cpu_get(cpu);
+-      unsigned int ret_freq = 0;
+-
+-      if (policy) {
+-              ret_freq = policy->max;
+-              cpufreq_cpu_put(policy);
+-      }
+-
+-      return ret_freq;
+-}
+-EXPORT_SYMBOL(compat_cpufreq_quick_get_max);
+-
+ 
+ static DEFINE_SPINLOCK(compat_simple_ida_lock);
+ 
+diff -Naur compat-wireless-3.6.8-1-snp.org/include/linux/compat-3.1.h compat-wireless-3.6.8-1-snp/include/linux/compat-3.1.h
+--- compat-wireless-3.6.8-1-snp.org/include/linux/compat-3.1.h 2012-10-24 15:22:50.000000000 +0200
++++ compat-wireless-3.6.8-1-snp/include/linux/compat-3.1.h     2013-01-18 16:52:04.106154741 +0100
+@@ -111,10 +111,6 @@
+ 
+ void ida_simple_remove(struct ida *ida, unsigned int id);
+ 
+-/* mask cpufreq_quick_get_max as RHEL6 backports this */
+-#define cpufreq_quick_get_max(a) compat_cpufreq_quick_get_max(a)
+-
+-unsigned int cpufreq_quick_get_max(unsigned int cpu);
+ #endif /* (LINUX_VERSION_CODE < KERNEL_VERSION(3,1,0)) */
+ 
+ #endif /* LINUX_3_1_COMPAT_H */