summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorBruce Ashfield <bruce.ashfield@windriver.com>2012-09-11 09:05:14 -0400
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-09-12 15:13:41 +0100
commit1d3391b84f6d9ac538e024da852ea7ff49203add (patch)
tree67fa5710fb91694f35cc9c9282fb4f9281b6d9cc /meta
parent84f54d6a5d2e892470b88e83f2d2d05e90bfcffc (diff)
downloadpoky-1d3391b84f6d9ac538e024da852ea7ff49203add.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. (From OE-Core rev: 7121fe8d836fc178e9ab8f0e6f8eb34a99325c81) Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-kernel/linux/linux-yocto-rt_3.0.bb2
-rw-r--r--meta/recipes-kernel/linux/linux-yocto-rt_3.2.bb2
-rw-r--r--meta/recipes-kernel/linux/linux-yocto-rt_3.4.bb2
-rw-r--r--meta/recipes-kernel/linux/linux-yocto_3.0.bb2
-rw-r--r--meta/recipes-kernel/linux/linux-yocto_3.2.bb2
-rw-r--r--meta/recipes-kernel/linux/linux-yocto_3.4.bb2
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
22COMPATIBLE_MACHINE = "(qemux86|qemux86-64|qemuarm)" 22COMPATIBLE_MACHINE = "(qemux86|qemux86-64|qemuarm)"
23 23
24# Functionality flags 24# Functionality flags
25KERNEL_FEATURES = "features/netfilter" 25KERNEL_FEATURES_append = " features/netfilter"
26KERNEL_FEATURES_append = " features/taskstats" 26KERNEL_FEATURES_append = " features/taskstats"
27KERNEL_FEATURES_append_qemux86 = " cfg/sound" 27KERNEL_FEATURES_append_qemux86 = " cfg/sound"
28KERNEL_FEATURES_append_qemux86-64 = " cfg/sound" 28KERNEL_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
23COMPATIBLE_MACHINE = "(qemux86|qemux86-64|qemuarm)" 23COMPATIBLE_MACHINE = "(qemux86|qemux86-64|qemuarm)"
24 24
25# Functionality flags 25# Functionality flags
26KERNEL_FEATURES = "features/netfilter" 26KERNEL_FEATURES_append = "features/netfilter"
27KERNEL_FEATURES_append = " features/taskstats" 27KERNEL_FEATURES_append = " features/taskstats"
28KERNEL_FEATURES_append_qemux86 = " cfg/sound" 28KERNEL_FEATURES_append_qemux86 = " cfg/sound"
29KERNEL_FEATURES_append_qemux86-64 = " cfg/sound" 29KERNEL_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
23COMPATIBLE_MACHINE = "(qemux86|qemux86-64|qemuarm)" 23COMPATIBLE_MACHINE = "(qemux86|qemux86-64|qemuarm)"
24 24
25# Functionality flags 25# Functionality flags
26KERNEL_FEATURES = "features/netfilter" 26KERNEL_FEATURES_append = " features/netfilter"
27KERNEL_FEATURES_append = " features/taskstats" 27KERNEL_FEATURES_append = " features/taskstats"
28KERNEL_FEATURES_append_qemux86 = " cfg/sound" 28KERNEL_FEATURES_append_qemux86 = " cfg/sound"
29KERNEL_FEATURES_append_qemux86-64 = " cfg/sound" 29KERNEL_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
27COMPATIBLE_MACHINE = "qemuarm|qemux86|qemuppc|qemumips|qemux86-64" 27COMPATIBLE_MACHINE = "qemuarm|qemux86|qemuppc|qemumips|qemux86-64"
28 28
29# Functionality flags 29# Functionality flags
30KERNEL_FEATURES = "features/netfilter" 30KERNEL_FEATURES_append = " features/netfilter"
31KERNEL_FEATURES_append = " features/taskstats" 31KERNEL_FEATURES_append = " features/taskstats"
32KERNEL_FEATURES_append_qemux86 = " cfg/sound" 32KERNEL_FEATURES_append_qemux86 = " cfg/sound"
33KERNEL_FEATURES_append_qemux86-64 = " cfg/sound" 33KERNEL_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
27COMPATIBLE_MACHINE = "qemuarm|qemux86|qemuppc|qemumips|qemux86-64" 27COMPATIBLE_MACHINE = "qemuarm|qemux86|qemuppc|qemumips|qemux86-64"
28 28
29# Functionality flags 29# Functionality flags
30KERNEL_FEATURES="features/netfilter" 30KERNEL_FEATURES_append=" features/netfilter"
31KERNEL_FEATURES_append=" features/taskstats" 31KERNEL_FEATURES_append=" features/taskstats"
32KERNEL_FEATURES_append_qemux86=" cfg/sound" 32KERNEL_FEATURES_append_qemux86=" cfg/sound"
33KERNEL_FEATURES_append_qemux86-64=" cfg/sound" 33KERNEL_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"
24 24
25# Functionality flags 25# Functionality flags
26KERNEL_REVISION_CHECKING="" 26KERNEL_REVISION_CHECKING=""
27KERNEL_FEATURES="features/netfilter" 27KERNEL_FEATURES_append = " features/netfilter"
28KERNEL_FEATURES_append_qemux86=" cfg/sound" 28KERNEL_FEATURES_append_qemux86=" cfg/sound"
29KERNEL_FEATURES_append_qemux86-64=" cfg/sound" 29KERNEL_FEATURES_append_qemux86-64=" cfg/sound"