From 060e7db0c4988e762fe874070af6c8ad8562822d Mon Sep 17 00:00:00 2001 From: Changqing Li Date: Tue, 6 Aug 2019 10:18:48 +0800 Subject: 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 Signed-off-by: Richard Purdie --- meta/conf/machine/qemux86-64.conf | 3 +++ 1 file changed, 3 insertions(+) (limited to 'meta/conf/machine/qemux86-64.conf') diff --git a/meta/conf/machine/qemux86-64.conf b/meta/conf/machine/qemux86-64.conf index 383e3bd6f3..4b50e664e4 100644 --- a/meta/conf/machine/qemux86-64.conf +++ b/meta/conf/machine/qemux86-64.conf @@ -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" -- cgit v1.2.3-54-g00ecf