summaryrefslogtreecommitdiff
path: root/meta/recipes-kernel
diff options
context:
space:
mode:
authorBruce Ashfield <bruce.ashfield@windriver.com>2013-02-04 14:05:07 -0500
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-02-06 09:35:04 +0000
commit26c71c895e1d56d2f3576de833a576137e970fcc (patch)
tree1a3b3ca0af22b19155a8fb3bb63244bcc289d495 /meta/recipes-kernel
parentf8619d777e734f3886b02bf87157761a6f78029b (diff)
downloadopenembedded-core-26c71c895e1d56d2f3576de833a576137e970fcc.tar.gz
openembedded-core-26c71c895e1d56d2f3576de833a576137e970fcc.tar.bz2
openembedded-core-26c71c895e1d56d2f3576de833a576137e970fcc.zip
linux-yocto: KERNEL_FEATURES should reference full scc files
Some existing KERNEL_FEATURE references use a shorcut notation, but mapping these shortcuts to actual .scc files in the tree are not obvious. So we clarify where they are found by referencing the full .scc filename in the KERNEL_FEATURE addtions. 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.2.bb8
-rw-r--r--meta/recipes-kernel/linux/linux-yocto-rt_3.4.bb10
-rw-r--r--meta/recipes-kernel/linux/linux-yocto_3.2.bb8
-rw-r--r--meta/recipes-kernel/linux/linux-yocto_3.4.bb12
4 files changed, 18 insertions, 20 deletions
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 0c82e16574..1f1b8de942 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_append = "features/netfilter"
-KERNEL_FEATURES_append = " features/taskstats"
-KERNEL_FEATURES_append_qemux86 = " cfg/sound"
-KERNEL_FEATURES_append_qemux86-64 = " cfg/sound"
+KERNEL_FEATURES_append = "features/netfilter/netfilter.scc"
+KERNEL_FEATURES_append = " features/taskstats/taskstats.scc"
+KERNEL_FEATURES_append_qemux86 = " cfg/sound.scc"
+KERNEL_FEATURES_append_qemux86-64 = " cfg/sound.scc"
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 ca9aa42eb9..c58efe7836 100644
--- a/meta/recipes-kernel/linux/linux-yocto-rt_3.4.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-rt_3.4.bb
@@ -23,8 +23,8 @@ SRC_URI = "git://git.yoctoproject.org/linux-yocto-3.4.git;protocol=git;bareclone
COMPATIBLE_MACHINE = "(qemux86|qemux86-64|qemuarm)"
# Functionality flags
-KERNEL_FEATURES_append = " features/netfilter"
-KERNEL_FEATURES_append = " features/taskstats"
-KERNEL_FEATURES_append_qemux86 = " cfg/sound"
-KERNEL_FEATURES_append_qemux86-64 = " cfg/sound"
-KERNEL_FEATURES_append = " ${@bb.utils.contains("TUNE_FEATURES", "mx32", " cfg/x32", "" ,d)}"
+KERNEL_FEATURES_append = " features/netfilter/netfilter.scc"
+KERNEL_FEATURES_append = " features/taskstats/taskstats.scc"
+KERNEL_FEATURES_append_qemux86 = " cfg/sound.scc"
+KERNEL_FEATURES_append_qemux86-64 = " cfg/sound.scc"
+KERNEL_FEATURES_append = " ${@bb.utils.contains("TUNE_FEATURES", "mx32", " cfg/x32.scc", "" ,d)}"
diff --git a/meta/recipes-kernel/linux/linux-yocto_3.2.bb b/meta/recipes-kernel/linux/linux-yocto_3.2.bb
index 77508fcf05..d080a6918a 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_append=" features/netfilter"
-KERNEL_FEATURES_append=" features/taskstats"
-KERNEL_FEATURES_append_qemux86=" cfg/sound"
-KERNEL_FEATURES_append_qemux86-64=" cfg/sound"
+KERNEL_FEATURES_append=" features/netfilter/netfilter.scc"
+KERNEL_FEATURES_append=" features/taskstats/taskstats.scc"
+KERNEL_FEATURES_append_qemux86=" cfg/sound.scc"
+KERNEL_FEATURES_append_qemux86-64=" cfg/sound.scc"
diff --git a/meta/recipes-kernel/linux/linux-yocto_3.4.bb b/meta/recipes-kernel/linux/linux-yocto_3.4.bb
index 4ab8c73481..ab975f2904 100644
--- a/meta/recipes-kernel/linux/linux-yocto_3.4.bb
+++ b/meta/recipes-kernel/linux/linux-yocto_3.4.bb
@@ -23,10 +23,8 @@ KMETA = "meta"
COMPATIBLE_MACHINE = "qemuarm|qemux86|qemuppc|qemumips|qemux86-64"
# Functionality flags
-KERNEL_REVISION_CHECKING=""
-KERNEL_FEATURES_append = " features/netfilter"
-KERNEL_FEATURES_append_qemux86=" cfg/sound"
-KERNEL_FEATURES_append_qemux86-64=" cfg/sound"
-KERNEL_FEATURES_append_qemux86=" cfg/paravirt_kvm"
-#KERNEL_FEATURES_append_qemux86-64=" cfg/paravirt_kvm"
-KERNEL_FEATURES_append = " ${@bb.utils.contains("TUNE_FEATURES", "mx32", " cfg/x32", "" ,d)}"
+KERNEL_FEATURES_append = " features/netfilter/netfilter.scc"
+KERNEL_FEATURES_append_qemux86=" cfg/sound.scc"
+KERNEL_FEATURES_append_qemux86-64=" cfg/sound.scc"
+KERNEL_FEATURES_append_qemux86=" cfg/paravirt_kvm.scc"
+KERNEL_FEATURES_append = " ${@bb.utils.contains("TUNE_FEATURES", "mx32", " cfg/x32.scc", "" ,d)}"