From: Bruce Ashfield Date: Tue, 25 Jun 2013 20:17:10 +0000 (-0400) Subject: linux-yocto/3.4: allow kernel feature _appends to be overriden X-Git-Tag: rev_ivi_2015_02_04~11994 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=6b9297ceaf00ecae8e5226fbf063fbc872d91803;p=scm%2Fbb%2Ftizen-distro.git linux-yocto/3.4: allow kernel feature _appends to be overriden Updating the linux-yocto 3.4 recipe's feature flags to match the 3.8 recipe, which has the following change: 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: 3bd592e832c6ce10947882f37564c12f4fa7f8e2) Signed-off-by: Bruce Ashfield Signed-off-by: Saul Wold Signed-off-by: Richard Purdie --- diff --git a/meta/recipes-kernel/linux/linux-yocto_3.4.bb b/meta/recipes-kernel/linux/linux-yocto_3.4.bb index 9d6d8c7..ade96be 100644 --- a/meta/recipes-kernel/linux/linux-yocto_3.4.bb +++ b/meta/recipes-kernel/linux/linux-yocto_3.4.bb @@ -23,7 +23,8 @@ KMETA = "meta" COMPATIBLE_MACHINE = "qemuarm|qemux86|qemuppc|qemumips|qemux86-64" # Functionality flags -KERNEL_FEATURES_append = " features/netfilter/netfilter.scc" -KERNEL_FEATURES_append_qemux86=" cfg/sound.scc" +KERNEL_EXTRA_FEATURES ?= "features/netfilter/netfilter.scc" +KERNEL_FEATURES_append = " ${KERNEL_EXTRA_FEATURES}" +KERNEL_FEATURES_append_qemux86=" cfg/sound.scc cfg/paravirt_kvm.scc" KERNEL_FEATURES_append_qemux86-64=" cfg/sound.scc" KERNEL_FEATURES_append = " ${@bb.utils.contains("TUNE_FEATURES", "mx32", " cfg/x32.scc", "" ,d)}"