From: Nitin A Kamble <[email protected]> In the intel common kernel recipes, instead of corei7-64-intel-common, intel-corei7-64-intel-common was specified as override. This was masking the KMACHINE and KBRANCH variables defined in these recipes causing unexpected build issues for kernels of BSPs like nuc.
Fixes bug: [YOCTO #6123] Signed-off-by: Nitin A Kamble <[email protected]> --- common/recipes-kernel/linux/linux-yocto-dev.bbappend | 4 ++-- common/recipes-kernel/linux/linux-yocto-rt_3.10.bbappend | 4 ++-- common/recipes-kernel/linux/linux-yocto_3.10.bbappend | 4 ++-- common/recipes-kernel/linux/linux-yocto_3.14.bbappend | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/common/recipes-kernel/linux/linux-yocto-dev.bbappend b/common/recipes-kernel/linux/linux-yocto-dev.bbappend index f01933f..1133ebb 100644 --- a/common/recipes-kernel/linux/linux-yocto-dev.bbappend +++ b/common/recipes-kernel/linux/linux-yocto-dev.bbappend @@ -14,8 +14,8 @@ LINUX_VERSION_corei7-64-intel-common = "3.14-rc8" COMPATIBLE_MACHINE_corei7-64-intel-common = "${MACHINE}" SRCREV_meta_corei7-64-intel-common = "3689f99f4d2a051e8d3ff72345a67d4d04a88020" SRCREV_machine_corei7-64-intel-common = "fecc3fd7d31bd93766ff4f0431fecdbbfa4c3a7c" -KMACHINE_intel-corei7-64-intel-common = "intel-corei7-64" -KBRANCH_intel-corei7-64-intel-common = "standard/base" +KMACHINE_corei7-64-intel-common = "intel-corei7-64" +KBRANCH_corei7-64-intel-common = "standard/base" KERNEL_FEATURES_append_corei7-64-intel-common = "${KERNEL_FEATURES_INTEL_COMMON}" # For Crystalforest and Romley diff --git a/common/recipes-kernel/linux/linux-yocto-rt_3.10.bbappend b/common/recipes-kernel/linux/linux-yocto-rt_3.10.bbappend index cfb4193..f4712ef 100644 --- a/common/recipes-kernel/linux/linux-yocto-rt_3.10.bbappend +++ b/common/recipes-kernel/linux/linux-yocto-rt_3.10.bbappend @@ -14,6 +14,6 @@ KERNEL_FEATURES_append_core2-32-intel-common = "${KERNEL_FEATURES_INTEL_COMMON}" COMPATIBLE_MACHINE_corei7-64-intel-common = "${MACHINE}" #SRCREV_meta_corei7-64-intel-common = "${AUTOREV}" #SRCREV_machine_corei7-64-intel-common = "${AUTOREV}" -KMACHINE_intel-corei7-64-intel-common = "intel-corei7-64" -KBRANCH_intel-corei7-64-intel-common = "standard/preempt-rt/base" +KMACHINE_corei7-64-intel-common = "intel-corei7-64" +KBRANCH_corei7-64-intel-common = "standard/preempt-rt/base" KERNEL_FEATURES_append_corei7-64-intel-common = "${KERNEL_FEATURES_INTEL_COMMON}" diff --git a/common/recipes-kernel/linux/linux-yocto_3.10.bbappend b/common/recipes-kernel/linux/linux-yocto_3.10.bbappend index a3fc207..539ea64 100644 --- a/common/recipes-kernel/linux/linux-yocto_3.10.bbappend +++ b/common/recipes-kernel/linux/linux-yocto_3.10.bbappend @@ -15,8 +15,8 @@ LINUX_VERSION_corei7-64-intel-common = "3.10.35" COMPATIBLE_MACHINE_corei7-64-intel-common = "${MACHINE}" SRCREV_meta_corei7-64-intel-common = "b6e58b33dd427fe471f8827c83e311acdf4558a4" SRCREV_machine_corei7-64-intel-common = "cee957655fe67826b2e827e2db41f156fa8f0cc4" -KMACHINE_intel-corei7-64-intel-common = "intel-corei7-64" -KBRANCH_intel-corei7-64-intel-common = "standard/base" +KMACHINE_corei7-64-intel-common = "intel-corei7-64" +KBRANCH_corei7-64-intel-common = "standard/base" KERNEL_FEATURES_append_corei7-64-intel-common = "${KERNEL_FEATURES_INTEL_COMMON}" # For Crystalforest and Romley diff --git a/common/recipes-kernel/linux/linux-yocto_3.14.bbappend b/common/recipes-kernel/linux/linux-yocto_3.14.bbappend index 0add080..9c1dd6a 100644 --- a/common/recipes-kernel/linux/linux-yocto_3.14.bbappend +++ b/common/recipes-kernel/linux/linux-yocto_3.14.bbappend @@ -15,8 +15,8 @@ LINUX_VERSION_corei7-64-intel-common = "3.14.0" COMPATIBLE_MACHINE_corei7-64-intel-common = "${MACHINE}" SRCREV_meta_corei7-64-intel-common = "fc8c30398dbc3cdea787a1042242d4aab689d0ae" SRCREV_machine_corei7-64-intel-common = "0143c6ebb4a2d63b241df5f608b19f483f7eb9e0" -KMACHINE_intel-corei7-64-intel-common = "intel-corei7-64" -KBRANCH_intel-corei7-64-intel-common = "standard/base" +KMACHINE_corei7-64-intel-common = "intel-corei7-64" +KBRANCH_corei7-64-intel-common = "standard/base" KERNEL_FEATURES_append_corei7-64-intel-common = "${KERNEL_FEATURES_INTEL_COMMON}" # For Crystalforest and Romley -- 1.8.1.4 -- _______________________________________________ meta-intel mailing list [email protected] https://lists.yoctoproject.org/listinfo/meta-intel
