summaryrefslogtreecommitdiffstats
path: root/meta/conf/machine/qemux86.conf
diff options
context:
space:
mode:
authorChangqing Li <changqing.li@windriver.com>2019-08-06 10:18:48 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-08-07 16:08:15 +0100
commit060e7db0c4988e762fe874070af6c8ad8562822d (patch)
treeafaf7708b3070c42f5c9d8e003efd52d19d93d1b /meta/conf/machine/qemux86.conf
parent83201d04f15b2e2219767730d3b7a94c32af2dd3 (diff)
downloadpoky-060e7db0c4988e762fe874070af6c8ad8562822d.tar.gz
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>
Diffstat (limited to 'meta/conf/machine/qemux86.conf')
-rw-r--r--meta/conf/machine/qemux86.conf3
1 files changed, 3 insertions, 0 deletions
diff --git a/meta/conf/machine/qemux86.conf b/meta/conf/machine/qemux86.conf
index 272ad1e187..3832302f07 100644
--- a/meta/conf/machine/qemux86.conf
+++ b/meta/conf/machine/qemux86.conf
@@ -39,3 +39,6 @@ module_conf_uvesafb = "options uvesafb mode_option=${UVESA_MODE}"
39 39
40WKS_FILE ?= "qemux86-directdisk.wks" 40WKS_FILE ?= "qemux86-directdisk.wks"
41do_image_wic[depends] += "syslinux:do_populate_sysroot syslinux-native:do_populate_sysroot mtools-native:do_populate_sysroot dosfstools-native:do_populate_sysroot" 41do_image_wic[depends] += "syslinux:do_populate_sysroot syslinux-native:do_populate_sysroot mtools-native:do_populate_sysroot dosfstools-native:do_populate_sysroot"
42
43#For runqemu
44QB_SYSTEM_NAME = "qemu-system-i386"