diff options
author | Anuj Mittal <anuj.mittal@intel.com> | 2021-08-06 11:23:34 +0800 |
---|---|---|
committer | Anuj Mittal <anuj.mittal@intel.com> | 2021-08-06 15:51:53 +0800 |
commit | e67676976b73b004eb293615edeb687b05013a17 (patch) | |
tree | 0dc1bb679d7fa43ddf6071f73f286aa5f6ed86d4 | |
parent | 07c200f3224dc9fac07d95c40296549203b48534 (diff) | |
download | meta-intel-e67676976b73b004eb293615edeb687b05013a17.tar.gz |
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 <anuj.mittal@intel.com>
-rw-r--r-- | conf/machine/include/meta-intel.inc | 2 | ||||
-rw-r--r-- | conf/machine/include/qemuboot-intel.inc | 16 | ||||
-rw-r--r-- | recipes-core/images/core-image-tiny.bb | 4 | ||||
-rw-r--r-- | 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 @@ | |||
5 | # | 5 | # |
6 | 6 | ||
7 | PREFERRED_PROVIDER_virtual/kernel ?= "linux-intel" | 7 | PREFERRED_PROVIDER_virtual/kernel ?= "linux-intel" |
8 | PREFERRED_PROVIDER_virtual/kernel_poky-tiny ?= "linux-intel" | 8 | PREFERRED_PROVIDER_virtual/kernel:poky-tiny ?= "linux-intel" |
9 | 9 | ||
10 | # Only use the Intel-tuned zlib for target builds to improve reuse | 10 | # Only use the Intel-tuned zlib for target builds to improve reuse |
11 | PREFERRED_PROVIDER_zlib = "zlib-intel" | 11 | 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 @@ | |||
1 | # For runqemu | 1 | # For runqemu |
2 | IMAGE_CLASSES += "qemuboot" | 2 | IMAGE_CLASSES += "qemuboot" |
3 | QB_SYSTEM_NAME_intel-core2-32 = "qemu-system-i386" | 3 | QB_SYSTEM_NAME_intel-core2-32 = "qemu-system-i386" |
4 | QB_CPU_intel-core2-32 = "-cpu coreduo" | 4 | QB_CPU:intel-core2-32 = "-cpu coreduo" |
5 | QB_CPU_KVM_intel-core2-32 = "-cpu kvm32" | 5 | QB_CPU_KVM:intel-core2-32 = "-cpu kvm32" |
6 | 6 | ||
7 | QB_SYSTEM_NAME_intel-corei7-64 = "qemu-system-x86_64" | 7 | QB_SYSTEM_NAME:intel-corei7-64 = "qemu-system-x86_64" |
8 | QB_CPU_intel-corei7-64 = "-cpu Nehalem" | 8 | QB_CPU:intel-corei7-64 = "-cpu Nehalem" |
9 | QB_CPU_KVM_intel-corei7-64 = "-cpu kvm64" | 9 | QB_CPU_KVM:intel-corei7-64 = "-cpu kvm64" |
10 | 10 | ||
11 | QB_SYSTEM_NAME_intel-skylake-64 = "qemu-system-x86_64" | 11 | QB_SYSTEM_NAME:intel-skylake-64 = "qemu-system-x86_64" |
12 | QB_CPU_intel-skylake-64 = "-cpu Skylake-Client" | 12 | QB_CPU:intel-skylake-64 = "-cpu Skylake-Client" |
13 | QB_CPU_KVM_intel-skylake-64 = "-cpu Skylake-Client" | 13 | QB_CPU_KVM:intel-skylake-64 = "-cpu Skylake-Client" |
14 | 14 | ||
15 | QB_AUDIO_DRV = "alsa" | 15 | QB_AUDIO_DRV = "alsa" |
16 | QB_AUDIO_OPT = "-soundhw ac97,es1370" | 16 | 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() { | |||
32 | d.appendVarFlag('do_image', 'depends', ' %s:do_image_complete' % initrd_i) | 32 | d.appendVarFlag('do_image', 'depends', ' %s:do_image_complete' % initrd_i) |
33 | } | 33 | } |
34 | 34 | ||
35 | WKS_FILE_intel-corei7-64 = "core-image-tiny.wks.in" | 35 | WKS_FILE:intel-corei7-64 = "core-image-tiny.wks.in" |
36 | WKS_FILE_intel-core2-32 = "core-image-tiny.wks.in" | 36 | 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 @@ | |||
3 | 3 | ||
4 | KERNEL_FEATURES_INTEL_COMMON ?= "" | 4 | KERNEL_FEATURES_INTEL_COMMON ?= "" |
5 | 5 | ||
6 | COMPATIBLE_MACHINE_intel-x86-common = "${MACHINE}" | 6 | COMPATIBLE_MACHINE:intel-x86-common = "${MACHINE}" |
7 | KERNEL_FEATURES_intel-x86-common = "${KERNEL_FEATURES_INTEL_COMMON}" | 7 | KERNEL_FEATURES:intel-x86-common = "${KERNEL_FEATURES_INTEL_COMMON}" |
8 | 8 | ||
9 | KMACHINE_corei7-64-intel-common = "intel-corei7-64" | 9 | KMACHINE:corei7-64-intel-common = "intel-corei7-64" |
10 | KMACHINE_core2-32-intel-common = "intel-core2-32" | 10 | KMACHINE:core2-32-intel-common = "intel-core2-32" |
11 | KMACHINE_skylake-64-intel-common = "intel-corei7-64" | 11 | KMACHINE:skylake-64-intel-common = "intel-corei7-64" |
12 | 12 | ||
13 | INTEL_COMMON_AUTOLOAD ?= " uio iwlwifi i915" | 13 | INTEL_COMMON_AUTOLOAD ?= " uio iwlwifi i915" |
14 | KERNEL_MODULE_AUTOLOAD_intel-x86-common = " ${INTEL_COMMON_AUTOLOAD}" | 14 | KERNEL_MODULE_AUTOLOAD:intel-x86-common = " ${INTEL_COMMON_AUTOLOAD}" |