MIRRORS/meta-intel
1
0
Fork 0
mirror of git://git.yoctoproject.org/meta-intel.git synced 2025-07-05 05:04:45 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

Manually move some overrides to new syntax

Browse Source 
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>
This commit is contained in:
Anuj Mittal 2021-08-06 11:23:34 +08:00
parent 07c200f322
commit e67676976b
4 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
conf/machine/include/meta-intel.inc
View File

@ -5,7 +5,7 @@
# #
PREFERRED_PROVIDER_virtual/kernel ?= "linux-intel" 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 # Only use the Intel-tuned zlib for target builds to improve reuse
PREFERRED_PROVIDER_zlib = "zlib-intel" PREFERRED_PROVIDER_zlib = "zlib-intel"

16
conf/machine/include/qemuboot-intel.inc
View File

@ -1,16 +1,16 @@
# For runqemu # For runqemu
IMAGE_CLASSES += "qemuboot" IMAGE_CLASSES += "qemuboot"
QB_SYSTEM_NAME_intel-core2-32 = "qemu-system-i386" QB_SYSTEM_NAME_intel-core2-32 = "qemu-system-i386"
QB_CPU_intel-core2-32 = "-cpu coreduo" QB_CPU:intel-core2-32 = "-cpu coreduo"
QB_CPU_KVM_intel-core2-32 = "-cpu kvm32" QB_CPU_KVM:intel-core2-32 = "-cpu kvm32"
QB_SYSTEM_NAME_intel-corei7-64 = "qemu-system-x86_64" QB_SYSTEM_NAME:intel-corei7-64 = "qemu-system-x86_64"
QB_CPU_intel-corei7-64 = "-cpu Nehalem" QB_CPU:intel-corei7-64 = "-cpu Nehalem"
QB_CPU_KVM_intel-corei7-64 = "-cpu kvm64" QB_CPU_KVM:intel-corei7-64 = "-cpu kvm64"
QB_SYSTEM_NAME_intel-skylake-64 = "qemu-system-x86_64" QB_SYSTEM_NAME:intel-skylake-64 = "qemu-system-x86_64"
QB_CPU_intel-skylake-64 = "-cpu Skylake-Client" QB_CPU:intel-skylake-64 = "-cpu Skylake-Client"
QB_CPU_KVM_intel-skylake-64 = "-cpu Skylake-Client" QB_CPU_KVM:intel-skylake-64 = "-cpu Skylake-Client"
QB_AUDIO_DRV = "alsa" QB_AUDIO_DRV = "alsa"
QB_AUDIO_OPT = "-soundhw ac97,es1370" QB_AUDIO_OPT = "-soundhw ac97,es1370"

4
recipes-core/images/core-image-tiny.bb
View File

@ -32,5 +32,5 @@ python() {
d.appendVarFlag('do_image', 'depends', ' %s:do_image_complete' % initrd_i) d.appendVarFlag('do_image', 'depends', ' %s:do_image_complete' % initrd_i)
} }
WKS_FILE_intel-corei7-64 = "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" WKS_FILE:intel-core2-32 = "core-image-tiny.wks.in"

12
recipes-kernel/linux/meta-intel-compat-kernel.inc
View File

@ -3,12 +3,12 @@
KERNEL_FEATURES_INTEL_COMMON ?= "" KERNEL_FEATURES_INTEL_COMMON ?= ""
COMPATIBLE_MACHINE_intel-x86-common = "${MACHINE}" COMPATIBLE_MACHINE:intel-x86-common = "${MACHINE}"
KERNEL_FEATURES_intel-x86-common = "${KERNEL_FEATURES_INTEL_COMMON}" KERNEL_FEATURES:intel-x86-common = "${KERNEL_FEATURES_INTEL_COMMON}"
KMACHINE_corei7-64-intel-common = "intel-corei7-64" KMACHINE:corei7-64-intel-common = "intel-corei7-64"
KMACHINE_core2-32-intel-common = "intel-core2-32" KMACHINE:core2-32-intel-common = "intel-core2-32"
KMACHINE_skylake-64-intel-common = "intel-corei7-64" KMACHINE:skylake-64-intel-common = "intel-corei7-64"
INTEL_COMMON_AUTOLOAD ?= " uio iwlwifi i915" INTEL_COMMON_AUTOLOAD ?= " uio iwlwifi i915"
KERNEL_MODULE_AUTOLOAD_intel-x86-common = " ${INTEL_COMMON_AUTOLOAD}" KERNEL_MODULE_AUTOLOAD:intel-x86-common = " ${INTEL_COMMON_AUTOLOAD}"