summaryrefslogtreecommitdiffstats
path: root/meta/recipes-kernel/linux/linux-yocto_3.8.bb
diff options
context:
space:
mode:
authorBruce Ashfield <bruce.ashfield@windriver.com>2013-04-11 03:45:25 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-04-11 08:27:41 +0100
commit7c06aec133007c75aadea18ecb85cbebbd862ccf (patch)
tree4b76afa2f081b50e7f6b867a8c8626c52106dbb1 /meta/recipes-kernel/linux/linux-yocto_3.8.bb
parent2a3f6772aadbe378259c87c05ab6f091866b63ef (diff)
downloadpoky-7c06aec133007c75aadea18ecb85cbebbd862ccf.tar.gz
linux-yocto/3.8: qemumips boot fixes and netfilter kernel features
Updating the linux-yocto-3.8 recipes to fix two issues: 1) qemumips boot This is fixed by: Revert "Input: i8042-io - fix up region handling on MIPS" And by disabling ftrace for qemumips boards 2) netfilter options being dropped When KERNEL_EXTRA_FEATURES was introduced, and allowed to be inhibited, the variable was only applied to qemux86 machines. It should be applied ot all machine types (unless inhibited), so we restore that functionality. (From OE-Core rev: 0271dec64591c4d91933b3a8db875a374a63640b) Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-kernel/linux/linux-yocto_3.8.bb')
-rw-r--r--meta/recipes-kernel/linux/linux-yocto_3.8.bb9
1 files changed, 5 insertions, 4 deletions
diff --git a/meta/recipes-kernel/linux/linux-yocto_3.8.bb b/meta/recipes-kernel/linux/linux-yocto_3.8.bb
index c861b99c2f..c0906e52ab 100644
--- a/meta/recipes-kernel/linux/linux-yocto_3.8.bb
+++ b/meta/recipes-kernel/linux/linux-yocto_3.8.bb
@@ -4,12 +4,12 @@ KBRANCH_DEFAULT = "standard/base"
4KBRANCH = "${KBRANCH_DEFAULT}" 4KBRANCH = "${KBRANCH_DEFAULT}"
5 5
6SRCREV_machine_qemuarm ?= "ec3299eaa89a7302009e3d46c9570f633ff32e9a" 6SRCREV_machine_qemuarm ?= "ec3299eaa89a7302009e3d46c9570f633ff32e9a"
7SRCREV_machine_qemumips ?= "e5e37d6aab5d82398f874f623ec9b37a8274f41a" 7SRCREV_machine_qemumips ?= "0d60789d710808e38690f27216c3ab13753e1055"
8SRCREV_machine_qemuppc ?= "223428bbc1a355200bd9a8046fd272c1b9b13e67" 8SRCREV_machine_qemuppc ?= "223428bbc1a355200bd9a8046fd272c1b9b13e67"
9SRCREV_machine_qemux86 ?= "11998bd1f44b21cd0b8c0ca11cbd36865f14bfdc" 9SRCREV_machine_qemux86 ?= "11998bd1f44b21cd0b8c0ca11cbd36865f14bfdc"
10SRCREV_machine_qemux86-64 ?= "11998bd1f44b21cd0b8c0ca11cbd36865f14bfdc" 10SRCREV_machine_qemux86-64 ?= "11998bd1f44b21cd0b8c0ca11cbd36865f14bfdc"
11SRCREV_machine ?= "11998bd1f44b21cd0b8c0ca11cbd36865f14bfdc" 11SRCREV_machine ?= "11998bd1f44b21cd0b8c0ca11cbd36865f14bfdc"
12SRCREV_meta ?= "1b94482e3ab8f7e495ee4d6971e13cdad1990e8e" 12SRCREV_meta ?= "27b63fdbd25ad1a37bacc05f49a205c150d21779"
13 13
14SRC_URI = "git://git.yoctoproject.org/linux-yocto-3.8.git;protocol=git;bareclone=1;branch=${KBRANCH},${KMETA};name=machine,meta" 14SRC_URI = "git://git.yoctoproject.org/linux-yocto-3.8.git;protocol=git;bareclone=1;branch=${KBRANCH},${KMETA};name=machine,meta"
15 15
@@ -24,6 +24,7 @@ COMPATIBLE_MACHINE = "qemuarm|qemux86|qemuppc|qemumips|qemux86-64"
24 24
25# Functionality flags 25# Functionality flags
26KERNEL_EXTRA_FEATURES ?= "features/netfilter/netfilter.scc" 26KERNEL_EXTRA_FEATURES ?= "features/netfilter/netfilter.scc"
27KERNEL_FEATURES_append_qemux86=" ${KERNEL_EXTRA_FEATURES} cfg/sound.scc cfg/paravirt_kvm.scc" 27KERNEL_FEATURES_append = " ${KERNEL_EXTRA_FEATURES}"
28KERNEL_FEATURES_append_qemux86-64=" ${KERNEL_EXTRA_FEATURES} cfg/sound.scc" 28KERNEL_FEATURES_append_qemux86=" cfg/sound.scc cfg/paravirt_kvm.scc"
29KERNEL_FEATURES_append_qemux86-64=" cfg/sound.scc"
29KERNEL_FEATURES_append = " ${@bb.utils.contains("TUNE_FEATURES", "mx32", " cfg/x32.scc", "" ,d)}" 30KERNEL_FEATURES_append = " ${@bb.utils.contains("TUNE_FEATURES", "mx32", " cfg/x32.scc", "" ,d)}"