From e67676976b73b004eb293615edeb687b05013a17 Mon Sep 17 00:00:00 2001 From: Anuj Mittal Date: Fri, 6 Aug 2021 11:23:34 +0800 Subject: Manually move some overrides to new syntax Some of these were missed when using the script and were noticed when building intel-skylake-64 and tiny images which had started failing. Signed-off-by: Anuj Mittal --- conf/machine/include/meta-intel.inc | 2 +- conf/machine/include/qemuboot-intel.inc | 16 ++++++++-------- recipes-core/images/core-image-tiny.bb | 4 ++-- recipes-kernel/linux/meta-intel-compat-kernel.inc | 12 ++++++------ 4 files changed, 17 insertions(+), 17 deletions(-) diff --git a/conf/machine/include/meta-intel.inc b/conf/machine/include/meta-intel.inc index db7c9c8b..a8d5c161 100644 --- a/conf/machine/include/meta-intel.inc +++ b/conf/machine/include/meta-intel.inc @@ -5,7 +5,7 @@ # PREFERRED_PROVIDER_virtual/kernel ?= "linux-intel" -PREFERRED_PROVIDER_virtual/kernel_poky-tiny ?= "linux-intel" +PREFERRED_PROVIDER_virtual/kernel:poky-tiny ?= "linux-intel" # Only use the Intel-tuned zlib for target builds to improve reuse PREFERRED_PROVIDER_zlib = "zlib-intel" diff --git a/conf/machine/include/qemuboot-intel.inc b/conf/machine/include/qemuboot-intel.inc index f2e99d02..56f1921a 100644 --- a/conf/machine/include/qemuboot-intel.inc +++ b/conf/machine/include/qemuboot-intel.inc @@ -1,16 +1,16 @@ # For runqemu IMAGE_CLASSES += "qemuboot" QB_SYSTEM_NAME_intel-core2-32 = "qemu-system-i386" -QB_CPU_intel-core2-32 = "-cpu coreduo" -QB_CPU_KVM_intel-core2-32 = "-cpu kvm32" +QB_CPU:intel-core2-32 = "-cpu coreduo" +QB_CPU_KVM:intel-core2-32 = "-cpu kvm32" -QB_SYSTEM_NAME_intel-corei7-64 = "qemu-system-x86_64" -QB_CPU_intel-corei7-64 = "-cpu Nehalem" -QB_CPU_KVM_intel-corei7-64 = "-cpu kvm64" +QB_SYSTEM_NAME:intel-corei7-64 = "qemu-system-x86_64" +QB_CPU:intel-corei7-64 = "-cpu Nehalem" +QB_CPU_KVM:intel-corei7-64 = "-cpu kvm64" -QB_SYSTEM_NAME_intel-skylake-64 = "qemu-system-x86_64" -QB_CPU_intel-skylake-64 = "-cpu Skylake-Client" -QB_CPU_KVM_intel-skylake-64 = "-cpu Skylake-Client" +QB_SYSTEM_NAME:intel-skylake-64 = "qemu-system-x86_64" +QB_CPU:intel-skylake-64 = "-cpu Skylake-Client" +QB_CPU_KVM:intel-skylake-64 = "-cpu Skylake-Client" QB_AUDIO_DRV = "alsa" QB_AUDIO_OPT = "-soundhw ac97,es1370" diff --git a/recipes-core/images/core-image-tiny.bb b/recipes-core/images/core-image-tiny.bb index 6b09b0c2..f521f668 100644 --- a/recipes-core/images/core-image-tiny.bb +++ b/recipes-core/images/core-image-tiny.bb @@ -32,5 +32,5 @@ python() { d.appendVarFlag('do_image', 'depends', ' %s:do_image_complete' % initrd_i) } -WKS_FILE_intel-corei7-64 = "core-image-tiny.wks.in" -WKS_FILE_intel-core2-32 = "core-image-tiny.wks.in" +WKS_FILE:intel-corei7-64 = "core-image-tiny.wks.in" +WKS_FILE:intel-core2-32 = "core-image-tiny.wks.in" diff --git a/recipes-kernel/linux/meta-intel-compat-kernel.inc b/recipes-kernel/linux/meta-intel-compat-kernel.inc index a985925f..41582aa5 100644 --- a/recipes-kernel/linux/meta-intel-compat-kernel.inc +++ b/recipes-kernel/linux/meta-intel-compat-kernel.inc @@ -3,12 +3,12 @@ KERNEL_FEATURES_INTEL_COMMON ?= "" -COMPATIBLE_MACHINE_intel-x86-common = "${MACHINE}" -KERNEL_FEATURES_intel-x86-common = "${KERNEL_FEATURES_INTEL_COMMON}" +COMPATIBLE_MACHINE:intel-x86-common = "${MACHINE}" +KERNEL_FEATURES:intel-x86-common = "${KERNEL_FEATURES_INTEL_COMMON}" -KMACHINE_corei7-64-intel-common = "intel-corei7-64" -KMACHINE_core2-32-intel-common = "intel-core2-32" -KMACHINE_skylake-64-intel-common = "intel-corei7-64" +KMACHINE:corei7-64-intel-common = "intel-corei7-64" +KMACHINE:core2-32-intel-common = "intel-core2-32" +KMACHINE:skylake-64-intel-common = "intel-corei7-64" INTEL_COMMON_AUTOLOAD ?= " uio iwlwifi i915" -KERNEL_MODULE_AUTOLOAD_intel-x86-common = " ${INTEL_COMMON_AUTOLOAD}" +KERNEL_MODULE_AUTOLOAD:intel-x86-common = " ${INTEL_COMMON_AUTOLOAD}" -- cgit v1.2.3-54-g00ecf