From 3b79d9a78816d2eb70fe54ca6cd086d94c115f05 Mon Sep 17 00:00:00 2001 From: Anuj Mittal Date: Thu, 31 May 2018 12:34:32 +0800 Subject: qemux86*: change default wic wks to qemux86-directdisk When runqemu is invoked with an image type (wic, hddimg etc) as a parameter, the kernel value and command line parameters from qemuboot.conf are ignored and not passed to qemu cmdline. As an example, when using: $ runqemu wic kvm It results in no network interface and video mode warnings when qemu is up because the -kernel and -append options were not passed. Change qemu conf to use qemux86-directdisk.wks that supplies the kernel parameters that are appended to the bootloader configuration when generating qemu wic images instead of relying on qemuboot.conf. Fixes [YOCTO #12224] Signed-off-by: Anuj Mittal Signed-off-by: Richard Purdie --- meta/conf/machine/qemux86-64.conf | 2 +- meta/conf/machine/qemux86.conf | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/conf/machine/qemux86-64.conf b/meta/conf/machine/qemux86-64.conf index fcc44595e8..2330c7d86e 100644 --- a/meta/conf/machine/qemux86-64.conf +++ b/meta/conf/machine/qemux86-64.conf @@ -33,5 +33,5 @@ KERNEL_MODULE_AUTOLOAD += "uvesafb" KERNEL_MODULE_PROBECONF += "uvesafb" module_conf_uvesafb = "options uvesafb mode_option=${UVESA_MODE}" -WKS_FILE ?= "directdisk.wks" +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" diff --git a/meta/conf/machine/qemux86.conf b/meta/conf/machine/qemux86.conf index c53f7a92ce..811e3ef7cf 100644 --- a/meta/conf/machine/qemux86.conf +++ b/meta/conf/machine/qemux86.conf @@ -32,5 +32,5 @@ KERNEL_MODULE_AUTOLOAD += "uvesafb" KERNEL_MODULE_PROBECONF += "uvesafb" module_conf_uvesafb = "options uvesafb mode_option=${UVESA_MODE}" -WKS_FILE ?= "directdisk.wks" +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" -- cgit 1.2.3-korg