[meta-intel] [PATCH] linux-intel.inc: set COMPATIBLE_MACHINE default

California Sullivan california.l.sullivan at intel.com
Tue Nov 28 14:10:07 PST 2017


Non-Intel* machines did not get COMPATIBLE_MACHINE set at all, allowing
the package to be built when it probably shouldn't have been. For
example, it would be built when the MACHINE was set to qemux86. This
caused lttng-modules to fail because lttng-modules only gets patched
for our kernel when an Intel MACHINE was being used in order to maintain
Yocto Project Compatibility status.

By setting the default it fails when an invalid MACHINE is used. Note
that while qemux86 is not a compatible MACHINE, the kernel itself does
have the necessary components to run under qemu.

Also change the COMPATIBLE_MACHINE overrides to use the x86-intel-common
override instead of machine-specific overrides since they all have the
same value.

[YOCTO #12278].

Signed-off-by: California Sullivan <california.l.sullivan at intel.com>
---
 recipes-kernel/linux/linux-intel.inc | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/recipes-kernel/linux/linux-intel.inc b/recipes-kernel/linux/linux-intel.inc
index 59b25851..057779a1 100644
--- a/recipes-kernel/linux/linux-intel.inc
+++ b/recipes-kernel/linux/linux-intel.inc
@@ -23,15 +23,15 @@ KCONF_BSP_AUDIT_LEVEL = "2"
 
 KERNEL_FEATURES_INTEL_COMMON ?= ""
 
-COMPATIBLE_MACHINE_core2-32-intel-common = "${MACHINE}"
+COMPATIBLE_MACHINE ?= "(intel-corei7-64|intel-core2-32|intel-quark)"
+COMPATIBLE_MACHINE_intel-x86-common = "${MACHINE}"
+
 KMACHINE_core2-32-intel-common = "intel-core2-32"
 KERNEL_FEATURES_append_core2-32-intel-common = "${KERNEL_FEATURES_INTEL_COMMON}"
 
-COMPATIBLE_MACHINE_corei7-64-intel-common = "${MACHINE}"
 KMACHINE_corei7-64-intel-common = "intel-corei7-64"
 KERNEL_FEATURES_append_corei7-64-intel-common = "${KERNEL_FEATURES_INTEL_COMMON}"
 
-COMPATIBLE_MACHINE_i586-nlp-32-intel-common = "${MACHINE}"
 KMACHINE_i586-nlp-32-intel-common = "intel-quark"
 KERNEL_FEATURES_append_i586-nlp-32-intel-common = "features/qat/qat.scc"
 
-- 
2.14.3



More information about the meta-intel mailing list