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
# 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
###############################################################################
# #
# 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 #
CFLAGS =
CXXFLAGS =
-PAK_VER = 24
+PAK_VER = 25
DEPS = ""
# Normal build or XEN build.
--- /dev/null
+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 */