From patchwork Tue Feb 5 15:56:35 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [3/3] linux-yocto: KERNEL_FEATURES should reference full scc files Date: Tue, 05 Feb 2013 15:56:35 -0000 From: Bruce Ashfield X-Patchwork-Id: 44131 Message-Id: <4aa36f477cf4648ad4a957d7b465db4434add386.1360079063.git.bruce.ashfield@windriver.com> To: richard.purdie@linuxfoundation.org Cc: openembedded-core@lists.openembedded.org 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 --- meta/recipes-kernel/linux/linux-yocto-rt_3.2.bb | 8 ++++---- meta/recipes-kernel/linux/linux-yocto-rt_3.4.bb | 10 +++++----- meta/recipes-kernel/linux/linux-yocto_3.2.bb | 8 ++++---- meta/recipes-kernel/linux/linux-yocto_3.4.bb | 12 +++++------- 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 0c82e16..1f1b8de 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 ca9aa42..c58efe7 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 77508fc..d080a69 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 4ab8c73..ab975f2 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)}"