diff options
| author |   Bruce Ashfield <bruce.ashfield@windriver.com> | 2012-09-11 09:05:14 -0400 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-09-12 14:44:54 +0100 |
| commit | 7121fe8d836fc178e9ab8f0e6f8eb34a99325c81 (patch) | |
| tree | 17f09bcd1579a57b7ae81758a6e05515e3b3f18b /meta/recipes-kernel | |
| parent | 3d07587cc530f856c985c03a9b9b42cfb89c502c (diff) | |
| download | openembedded-core-contrib-7121fe8d836fc178e9ab8f0e6f8eb34a99325c81.tar.gz | |
linux-yocto*: append to KERNEL_FEATURES instead of assigning
It is sometimes useful for KERNEL_FEATURES to be set in a machine
or other configuration file. The linux-yocto recipes currently
initialize the variable, which clobbers any values set by .conf
files.
Appending to the variables allows these settings to propagate to
the kernel configuration, while maintaining the existing set of
added kernel features.
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Diffstat (limited to 'meta/recipes-kernel')
| -rw-r--r-- | meta/recipes-kernel/linux/linux-yocto-rt_3.0.bb | 2 | ||||
| -rw-r--r-- | meta/recipes-kernel/linux/linux-yocto-rt_3.2.bb | 2 | ||||
| -rw-r--r-- | meta/recipes-kernel/linux/linux-yocto-rt_3.4.bb | 2 | ||||
| -rw-r--r-- | meta/recipes-kernel/linux/linux-yocto_3.0.bb | 2 | ||||
| -rw-r--r-- | meta/recipes-kernel/linux/linux-yocto_3.2.bb | 2 | ||||
| -rw-r--r-- | meta/recipes-kernel/linux/linux-yocto_3.4.bb | 2 |
6 files changed, 6 insertions, 6 deletions
diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_3.0.bb b/meta/recipes-kernel/linux/linux-yocto-rt_3.0.bb index a16b5499f2..0cdc7c0c34 100644 --- a/meta/recipes-kernel/linux/linux-yocto-rt_3.0.bb +++ b/meta/recipes-kernel/linux/linux-yocto-rt_3.0.bb @@ -22,7 +22,7 @@ SRC_URI = "git://git.yoctoproject.org/linux-yocto-3.0.git;protocol=git;bareclone COMPATIBLE_MACHINE = "(qemux86|qemux86-64|qemuarm)" # Functionality flags -KERNEL_FEATURES = "features/netfilter" +KERNEL_FEATURES_append = " features/netfilter" KERNEL_FEATURES_append = " features/taskstats" KERNEL_FEATURES_append_qemux86 = " cfg/sound" KERNEL_FEATURES_append_qemux86-64 = " cfg/sound" diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_3.2.bb b/meta/recipes-kernel/linux/linux-yocto-rt_3.2.bb index 05362efe62..a3900ce391 100644 --- a/meta/recipes-kernel/linux/linux-yocto-rt_3.2.bb +++ b/meta/recipes-kernel/linux/linux-yocto-rt_3.2.bb @@ -23,7 +23,7 @@ SRC_URI = "git://git.yoctoproject.org/linux-yocto-3.2.git;protocol=git;bareclone COMPATIBLE_MACHINE = "(qemux86|qemux86-64|qemuarm)" # Functionality flags -KERNEL_FEATURES = "features/netfilter" +KERNEL_FEATURES_append = "features/netfilter" KERNEL_FEATURES_append = " features/taskstats" KERNEL_FEATURES_append_qemux86 = " cfg/sound" KERNEL_FEATURES_append_qemux86-64 = " cfg/sound" diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_3.4.bb b/meta/recipes-kernel/linux/linux-yocto-rt_3.4.bb index 3b36378ef5..4fd3845d5e 100644 --- a/meta/recipes-kernel/linux/linux-yocto-rt_3.4.bb +++ b/meta/recipes-kernel/linux/linux-yocto-rt_3.4.bb @@ -23,7 +23,7 @@ SRC_URI = "git://git.yoctoproject.org/linux-yocto-3.4.git;protocol=git;bareclone COMPATIBLE_MACHINE = "(qemux86|qemux86-64|qemuarm)" # Functionality flags -KERNEL_FEATURES = "features/netfilter" +KERNEL_FEATURES_append = " features/netfilter" KERNEL_FEATURES_append = " features/taskstats" KERNEL_FEATURES_append_qemux86 = " cfg/sound" KERNEL_FEATURES_append_qemux86-64 = " cfg/sound" diff --git a/meta/recipes-kernel/linux/linux-yocto_3.0.bb b/meta/recipes-kernel/linux/linux-yocto_3.0.bb index d16cdf0dc2..e917beba49 100644 --- a/meta/recipes-kernel/linux/linux-yocto_3.0.bb +++ b/meta/recipes-kernel/linux/linux-yocto_3.0.bb @@ -27,7 +27,7 @@ SRC_URI = "git://git.yoctoproject.org/linux-yocto-3.0;protocol=git;bareclone=1;b COMPATIBLE_MACHINE = "qemuarm|qemux86|qemuppc|qemumips|qemux86-64" # Functionality flags -KERNEL_FEATURES = "features/netfilter" +KERNEL_FEATURES_append = " features/netfilter" KERNEL_FEATURES_append = " features/taskstats" KERNEL_FEATURES_append_qemux86 = " cfg/sound" KERNEL_FEATURES_append_qemux86-64 = " cfg/sound" diff --git a/meta/recipes-kernel/linux/linux-yocto_3.2.bb b/meta/recipes-kernel/linux/linux-yocto_3.2.bb index ba4b536c6a..45414d5ce4 100644 --- a/meta/recipes-kernel/linux/linux-yocto_3.2.bb +++ b/meta/recipes-kernel/linux/linux-yocto_3.2.bb @@ -27,7 +27,7 @@ SRC_URI = "git://git.yoctoproject.org/linux-yocto-3.2;protocol=git;bareclone=1;b COMPATIBLE_MACHINE = "qemuarm|qemux86|qemuppc|qemumips|qemux86-64" # Functionality flags -KERNEL_FEATURES="features/netfilter" +KERNEL_FEATURES_append=" features/netfilter" KERNEL_FEATURES_append=" features/taskstats" KERNEL_FEATURES_append_qemux86=" cfg/sound" KERNEL_FEATURES_append_qemux86-64=" cfg/sound" diff --git a/meta/recipes-kernel/linux/linux-yocto_3.4.bb b/meta/recipes-kernel/linux/linux-yocto_3.4.bb index 7258cba63d..59ad4b27be 100644 --- a/meta/recipes-kernel/linux/linux-yocto_3.4.bb +++ b/meta/recipes-kernel/linux/linux-yocto_3.4.bb @@ -24,6 +24,6 @@ COMPATIBLE_MACHINE = "qemuarm|qemux86|qemuppc|qemumips|qemux86-64" # Functionality flags KERNEL_REVISION_CHECKING="" -KERNEL_FEATURES="features/netfilter" +KERNEL_FEATURES_append = " features/netfilter" KERNEL_FEATURES_append_qemux86=" cfg/sound" KERNEL_FEATURES_append_qemux86-64=" cfg/sound" |