From: Anuj Mittal Date: Thu, 31 May 2018 04:34:32 +0000 (+0800) Subject: qemux86*: change default wic wks to qemux86-directdisk X-Git-Tag: lucaceresoli/bug-15201-perf-libtraceevent-missing~17787 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3b79d9a78;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git 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 --- diff --git a/meta/conf/machine/qemux86-64.conf b/meta/conf/machine/qemux86-64.conf index fcc44595e8c..2330c7d86e7 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 c53f7a92ce5..811e3ef7cf1 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"