From 8e0b8336b9a37e5878955cb9b8953f19804138cd Mon Sep 17 00:00:00 2001 From: Rebecca Chang Swee Fun Date: Tue, 13 Sep 2016 09:17:37 +0800 Subject: linux-yocto_4.1: use bb.utils.contains for KERNEL_FEATURES selection Using bb.utils.contains() enable selection of source revision on machine branch, KBRANCH and KMACHINE in kernel recipe. leafhill is new bsp type setup in yocto-kernel-cache. This bsp will build kernel from standard/intel/4.1.27/leaf-hill with a fixed kernel base version of v4.1.27. This commit includes update on yocto-kernel-cache meta SRCREV. Signed-off-by: Rebecca Chang Swee Fun Signed-off-by: Saul Wold --- common/recipes-kernel/linux/linux-yocto_4.1.bbappend | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/common/recipes-kernel/linux/linux-yocto_4.1.bbappend b/common/recipes-kernel/linux/linux-yocto_4.1.bbappend index c87a7e25..5c5c96e1 100644 --- a/common/recipes-kernel/linux/linux-yocto_4.1.bbappend +++ b/common/recipes-kernel/linux/linux-yocto_4.1.bbappend @@ -10,12 +10,12 @@ SRCREV_meta_core2-32-intel-common ?= "20edcbf4e42dd4cef7213a0ce2a4481d8d296f5d" SRCREV_machine_core2-32-intel-common ?= "9195020e5747fba069c19996fab079931584a7fb" KERNEL_FEATURES_append_core2-32-intel-common = "${KERNEL_FEATURES_INTEL_COMMON}" -LINUX_VERSION_corei7-64-intel-common = "4.1.26" +LINUX_VERSION_corei7-64-intel-common = "${@bb.utils.contains('KERNEL_FEATURES', 'leafhill', '4.1.27', '4.1.26', d)}" COMPATIBLE_MACHINE_corei7-64-intel-common = "${MACHINE}" -KMACHINE_corei7-64-intel-common = "intel-corei7-64" -KBRANCH_corei7-64-intel-common = "standard/intel/base" -SRCREV_meta_corei7-64-intel-common ?= "20edcbf4e42dd4cef7213a0ce2a4481d8d296f5d" -SRCREV_machine_corei7-64-intel-common ?= "9195020e5747fba069c19996fab079931584a7fb" +KMACHINE_corei7-64-intel-common = "${@bb.utils.contains('KERNEL_FEATURES', 'leafhill', 'leafhill', 'intel-corei7-64', d)}" +KBRANCH_corei7-64-intel-common = "${@bb.utils.contains('KERNEL_FEATURES', 'leafhill', 'standard/intel/4.1.27/leaf-hill', 'standard/intel/base', d)}" +SRCREV_meta_corei7-64-intel-common ?= "cf6d9876629270e8ed99541db252840291d03f5a" +SRCREV_machine_corei7-64-intel-common ?= "${@bb.utils.contains('KERNEL_FEATURES', 'leafhill', '41fc98f785ad56f0df1b85ac039bd5e391697842', '9195020e5747fba069c19996fab079931584a7fb', d)}" KERNEL_FEATURES_append_corei7-64-intel-common = "${KERNEL_FEATURES_INTEL_COMMON}" # Quark / X1000 BSP Info @@ -27,7 +27,6 @@ SRCREV_meta_i586-nlp-32-intel-common ?= "20edcbf4e42dd4cef7213a0ce2a4481d8d296f5 SRCREV_machine_i586-nlp-32-intel-common ?= "9195020e5747fba069c19996fab079931584a7fb" KERNEL_FEATURES_append_i586-nlp-32-intel-common = "" - # For Crystalforest and Romley KERNEL_MODULE_AUTOLOAD_append_core2-32-intel-common = " uio" KERNEL_MODULE_AUTOLOAD_append_corei7-64-intel-common = " uio" -- cgit v1.2.3-54-g00ecf