mirror of
https://git.yoctoproject.org/poky
synced 2026-05-07 16:59:22 +00:00
qemuboot-x86: move QB_SYSTEM_NAME to corresponding conf
Configrations: MACHINE: qemux86-64 require conf/multilib.conf MULTILIBS = "multilib:lib32" DEFAULTTUNE_virtclass-multilib-lib32 = "x86" Reproduce steps: bitbake lib32-core-image-minimal runqemu qemux86-64 nographic lib32-core-image-minimal Errors: qemu cannot bootup since: Booting from ROM... This kernel requires an x86-64 CPU, but only detected an i686 CPU. Unable to boot - please use a kernel appropriate for your CPU. QEMU: Terminated For lib32 image, override has x86, so the qemubin set to qemu-system-i386, fix by move QB_SYSTEM_NAME to corresponding conf, don't use the override (From OE-Core rev: ffaf86f175b2e6caa3a0067f7b3725930b053715) Signed-off-by: Changqing Li <changqing.li@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
committed by
Richard Purdie
parent
83201d04f1
commit
060e7db0c4
@@ -1,10 +1,8 @@
|
||||
# For runqemu
|
||||
IMAGE_CLASSES += "qemuboot"
|
||||
QB_SYSTEM_NAME_x86 = "qemu-system-i386"
|
||||
QB_CPU_x86 = "-cpu core2duo"
|
||||
QB_CPU_KVM_x86 = "-cpu core2duo"
|
||||
|
||||
QB_SYSTEM_NAME_x86-64 = "qemu-system-x86_64"
|
||||
QB_CPU_x86-64 = "-cpu core2duo"
|
||||
QB_CPU_KVM_x86-64 = "-cpu core2duo"
|
||||
|
||||
|
||||
@@ -39,3 +39,6 @@ module_conf_uvesafb = "options uvesafb mode_option=${UVESA_MODE}"
|
||||
|
||||
WKS_FILE ?= "qemux86-directdisk.wks"
|
||||
do_image_wic[depends] += "syslinux:do_populate_sysroot syslinux-native:do_populate_sysroot mtools-native:do_populate_sysroot dosfstools-native:do_populate_sysroot"
|
||||
|
||||
#For runqemu
|
||||
QB_SYSTEM_NAME = "qemu-system-x86_64"
|
||||
|
||||
@@ -39,3 +39,6 @@ module_conf_uvesafb = "options uvesafb mode_option=${UVESA_MODE}"
|
||||
|
||||
WKS_FILE ?= "qemux86-directdisk.wks"
|
||||
do_image_wic[depends] += "syslinux:do_populate_sysroot syslinux-native:do_populate_sysroot mtools-native:do_populate_sysroot dosfstools-native:do_populate_sysroot"
|
||||
|
||||
#For runqemu
|
||||
QB_SYSTEM_NAME = "qemu-system-i386"
|
||||
|
||||
Reference in New Issue
Block a user