summaryrefslogtreecommitdiffstats
path: root/recipes-kernel/linux
diff options
context:
space:
mode:
authorCalifornia Sullivan <california.l.sullivan@intel.com>2017-11-28 22:10:07 (GMT)
committerSaul Wold <sgw@linux.intel.com>2017-11-29 00:15:14 (GMT)
commitc811c0b33862a2f911fe2afdd2054958b1f28e40 (patch)
treeeb1cd428bd7c781007b85f5acdff1ae509f7f2a9 /recipes-kernel/linux
parent60778f7540b551ff826fb3f2baed36172ceaec68 (diff)
downloadmeta-intel-c811c0b33862a2f911fe2afdd2054958b1f28e40.tar.gz
linux-intel.inc: set COMPATIBLE_MACHINE default
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@intel.com> Signed-off-by: Saul Wold <sgw@linux.intel.com>
Diffstat (limited to 'recipes-kernel/linux')
-rw-r--r--recipes-kernel/linux/linux-intel.inc6
1 files changed, 3 insertions, 3 deletions
diff --git a/recipes-kernel/linux/linux-intel.inc b/recipes-kernel/linux/linux-intel.inc
index 59b2585..057779a 100644
--- a/recipes-kernel/linux/linux-intel.inc
+++ b/recipes-kernel/linux/linux-intel.inc
@@ -23,15 +23,15 @@ KCONF_BSP_AUDIT_LEVEL = "2"
23 23
24KERNEL_FEATURES_INTEL_COMMON ?= "" 24KERNEL_FEATURES_INTEL_COMMON ?= ""
25 25
26COMPATIBLE_MACHINE_core2-32-intel-common = "${MACHINE}" 26COMPATIBLE_MACHINE ?= "(intel-corei7-64|intel-core2-32|intel-quark)"
27COMPATIBLE_MACHINE_intel-x86-common = "${MACHINE}"
28
27KMACHINE_core2-32-intel-common = "intel-core2-32" 29KMACHINE_core2-32-intel-common = "intel-core2-32"
28KERNEL_FEATURES_append_core2-32-intel-common = "${KERNEL_FEATURES_INTEL_COMMON}" 30KERNEL_FEATURES_append_core2-32-intel-common = "${KERNEL_FEATURES_INTEL_COMMON}"
29 31
30COMPATIBLE_MACHINE_corei7-64-intel-common = "${MACHINE}"
31KMACHINE_corei7-64-intel-common = "intel-corei7-64" 32KMACHINE_corei7-64-intel-common = "intel-corei7-64"
32KERNEL_FEATURES_append_corei7-64-intel-common = "${KERNEL_FEATURES_INTEL_COMMON}" 33KERNEL_FEATURES_append_corei7-64-intel-common = "${KERNEL_FEATURES_INTEL_COMMON}"
33 34
34COMPATIBLE_MACHINE_i586-nlp-32-intel-common = "${MACHINE}"
35KMACHINE_i586-nlp-32-intel-common = "intel-quark" 35KMACHINE_i586-nlp-32-intel-common = "intel-quark"
36KERNEL_FEATURES_append_i586-nlp-32-intel-common = "features/qat/qat.scc" 36KERNEL_FEATURES_append_i586-nlp-32-intel-common = "features/qat/qat.scc"
37 37