summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBruce Ashfield <bruce.ashfield@windriver.com>2013-03-26 07:46:32 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-03-26 17:50:09 +0000
commitec9210718e8cd28ef5cddaa2a148e30cd9a21601 (patch)
treea759448b774bb46062af9cc7e23a230c6f5d76e1
parent720492dd14290e7b559b870131cc8ee3d6630758 (diff)
downloadpoky-ec9210718e8cd28ef5cddaa2a148e30cd9a21601.tar.gz
linux-yocto/3.8: allow kernel feature _appends to be overriden
It was pointed out that the current way the KERNEL_FEATURES variable is appended in the base linux-yocto recipe doesn't allow the appended features to be prevented in a layer without using python code and a recipe finalize hook. To allow easier overriding of 'extra' or 'optional' features that are defined in the linux-yocto recipe, we create a KERNEL_EXTRA_FEATURES variable. This variable can be set in a layer to define extra features or cleared to prevent the recipe's extra features from being appended to the core functionality. (From OE-Core rev: 779cb6e51fab87e00784bd97ec4771e69a79cf82) Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-kernel/linux/linux-yocto_3.8.bb7
1 files changed, 3 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 b395e45488..f29675aab2 100644
--- a/meta/recipes-kernel/linux/linux-yocto_3.8.bb
+++ b/meta/recipes-kernel/linux/linux-yocto_3.8.bb
@@ -23,8 +23,7 @@ KMETA = "meta"
23COMPATIBLE_MACHINE = "qemuarm|qemux86|qemuppc|qemumips|qemux86-64" 23COMPATIBLE_MACHINE = "qemuarm|qemux86|qemuppc|qemumips|qemux86-64"
24 24
25# Functionality flags 25# Functionality flags
26KERNEL_FEATURES_append = " features/netfilter/netfilter.scc" 26KERNEL_EXTRA_FEATURES ?= "features/netfilter/netfilter.scc"
27KERNEL_FEATURES_append_qemux86=" cfg/sound.scc" 27KERNEL_FEATURES_append_qemux86=" ${KERNEL_EXTRA_FEATURES} cfg/sound.scc cfg/paravirt_kvm.scc"
28KERNEL_FEATURES_append_qemux86-64=" cfg/sound.scc" 28KERNEL_FEATURES_append_qemux86-64=" ${KERNEL_EXTRA_FEATURES} cfg/sound.scc"
29KERNEL_FEATURES_append_qemux86=" cfg/paravirt_kvm.scc"
30KERNEL_FEATURES_append = " ${@bb.utils.contains("TUNE_FEATURES", "mx32", " cfg/x32.scc", "" ,d)}" 29KERNEL_FEATURES_append = " ${@bb.utils.contains("TUNE_FEATURES", "mx32", " cfg/x32.scc", "" ,d)}"