1 files changed, 4 insertions, 4 deletions
diff --git a/common/recipes-kernel/linux/linux-yocto_4.1.bbappend b/common/recipes-kernel/linux/linux-yocto_4.1.bbappend
index 48445d8b..e559e8ca 100644
--- a/common/recipes-kernel/linux/linux-yocto_4.1.bbappend
+++ b/common/recipes-kernel/linux/linux-yocto_4.1.bbappend
@@ -11,12 +11,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 = "${@bb.utils.contains('KERNEL_FEATURES', 'leafhill', '4.1.27', '4.1.26', d)}"
+LINUX_VERSION_corei7-64-intel-common = "${@bb.utils.contains('BSP_SUBTYPE', 'leafhill', '4.1.27', '4.1.26', d)}"
 COMPATIBLE_MACHINE_corei7-64-intel-common = "${MACHINE}"
-KMACHINE_corei7-64-intel-common = "${@bb.utils.contains('KERNEL_FEATURES', 'leafhill', 'leafhill', 'intel-corei7-64', d)}"
+KMACHINE_corei7-64-intel-common = "${@bb.utils.contains('BSP_SUBTYPE', '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)}"
+KBRANCH_corei7-64-intel-common = "${@bb.utils.contains('BSP_SUBTYPE', 'leafhill', 'standard/intel/4.1.27/leaf-hill', 'standard/intel/base', d)}"
 SRCREV_meta_corei7-64-intel-common ?= "68b5089eeffb5878a990d9eb418407c8e18a6f37"
-SRCREV_machine_corei7-64-intel-common ?= "${@bb.utils.contains('KERNEL_FEATURES', 'leafhill', '41fc98f785ad56f0df1b85ac039bd5e391697842', '9195020e5747fba069c19996fab079931584a7fb', d)}"
+SRCREV_machine_corei7-64-intel-common ?= "${@bb.utils.contains('BSP_SUBTYPE', 'leafhill', '41fc98f785ad56f0df1b85ac039bd5e391697842', '9195020e5747fba069c19996fab079931584a7fb', d)}"
 KERNEL_FEATURES_append_corei7-64-intel-common = "${KERNEL_FEATURES_INTEL_COMMON} \
                                                 ${@bb.utils.contains('AUDIO_FEATURES', 'ssp', '${KERNEL_FEATURES_LEAFHILL_AUDIO}', '', d)}"

diff --git a/common/recipes-kernel/linux/linux-yocto_4.1.bbappend b/common/recipes-kernel/linux/linux-yocto_4.1.bbappend index 48445d8b..e559e8ca 100644 --- a/common/recipes-kernel/linux/linux-yocto_4.1.bbappend +++ b/common/recipes-kernel/linux/linux-yocto_4.1.bbappend
@@ -11,12 +11,12 @@ SRCREV_meta_core2-32-intel-common ?= "20edcbf4e42dd4cef7213a0ce2a4481d8d296f5d"
11	SRCREV_machine_core2-32-intel-common ?= "9195020e5747fba069c19996fab079931584a7fb"	11	SRCREV_machine_core2-32-intel-common ?= "9195020e5747fba069c19996fab079931584a7fb"
12	KERNEL_FEATURES_append_core2-32-intel-common = "${KERNEL_FEATURES_INTEL_COMMON}"	12	KERNEL_FEATURES_append_core2-32-intel-common = "${KERNEL_FEATURES_INTEL_COMMON}"
13		13
14	LINUX_VERSION_corei7-64-intel-common = "${@bb.utils.contains('KERNEL_FEATURES', 'leafhill', '4.1.27', '4.1.26', d)}"	14	LINUX_VERSION_corei7-64-intel-common = "${@bb.utils.contains('BSP_SUBTYPE', 'leafhill', '4.1.27', '4.1.26', d)}"
15	COMPATIBLE_MACHINE_corei7-64-intel-common = "${MACHINE}"	15	COMPATIBLE_MACHINE_corei7-64-intel-common = "${MACHINE}"
16	KMACHINE_corei7-64-intel-common = "${@bb.utils.contains('KERNEL_FEATURES', 'leafhill', 'leafhill', 'intel-corei7-64', d)}"	16	KMACHINE_corei7-64-intel-common = "${@bb.utils.contains('BSP_SUBTYPE', 'leafhill', 'leafhill', 'intel-corei7-64', d)}"
17	KBRANCH_corei7-64-intel-common = "${@bb.utils.contains('KERNEL_FEATURES', 'leafhill', 'standard/intel/4.1.27/leaf-hill', 'standard/intel/base', d)}"	17	KBRANCH_corei7-64-intel-common = "${@bb.utils.contains('BSP_SUBTYPE', 'leafhill', 'standard/intel/4.1.27/leaf-hill', 'standard/intel/base', d)}"
18	SRCREV_meta_corei7-64-intel-common ?= "68b5089eeffb5878a990d9eb418407c8e18a6f37"	18	SRCREV_meta_corei7-64-intel-common ?= "68b5089eeffb5878a990d9eb418407c8e18a6f37"
19	SRCREV_machine_corei7-64-intel-common ?= "${@bb.utils.contains('KERNEL_FEATURES', 'leafhill', '41fc98f785ad56f0df1b85ac039bd5e391697842', '9195020e5747fba069c19996fab079931584a7fb', d)}"	19	SRCREV_machine_corei7-64-intel-common ?= "${@bb.utils.contains('BSP_SUBTYPE', 'leafhill', '41fc98f785ad56f0df1b85ac039bd5e391697842', '9195020e5747fba069c19996fab079931584a7fb', d)}"
20	KERNEL_FEATURES_append_corei7-64-intel-common = "${KERNEL_FEATURES_INTEL_COMMON} \	20	KERNEL_FEATURES_append_corei7-64-intel-common = "${KERNEL_FEATURES_INTEL_COMMON} \
21	${@bb.utils.contains('AUDIO_FEATURES', 'ssp', '${KERNEL_FEATURES_LEAFHILL_AUDIO}', '', d)}"	21	${@bb.utils.contains('AUDIO_FEATURES', 'ssp', '${KERNEL_FEATURES_LEAFHILL_AUDIO}', '', d)}"
22		22