summaryrefslogtreecommitdiffstats
path: root/meta/conf/machine
diff options
context:
space:
mode:
authorAnuj Mittal <anuj.mittal@intel.com>2018-05-31 12:34:32 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-06-04 15:15:00 +0100
commit693638fd5dc46369a58e4913c5a70bf23e82ce17 (patch)
treeb4d45166230cad2eaa7e2372c4874cc2a51d6e9c /meta/conf/machine
parentae11216d9ef51ecaf23873158ab4306c56a16c6e (diff)
downloadpoky-693638fd5dc46369a58e4913c5a70bf23e82ce17.tar.gz
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] (From OE-Core rev: 3b79d9a78816d2eb70fe54ca6cd086d94c115f05) Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/conf/machine')
-rw-r--r--meta/conf/machine/qemux86-64.conf2
-rw-r--r--meta/conf/machine/qemux86.conf2
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"
33KERNEL_MODULE_PROBECONF += "uvesafb" 33KERNEL_MODULE_PROBECONF += "uvesafb"
34module_conf_uvesafb = "options uvesafb mode_option=${UVESA_MODE}" 34module_conf_uvesafb = "options uvesafb mode_option=${UVESA_MODE}"
35 35
36WKS_FILE ?= "directdisk.wks" 36WKS_FILE ?= "qemux86-directdisk.wks"
37do_image_wic[depends] += "syslinux:do_populate_sysroot syslinux-native:do_populate_sysroot mtools-native:do_populate_sysroot dosfstools-native:do_populate_sysroot" 37do_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"
32KERNEL_MODULE_PROBECONF += "uvesafb" 32KERNEL_MODULE_PROBECONF += "uvesafb"
33module_conf_uvesafb = "options uvesafb mode_option=${UVESA_MODE}" 33module_conf_uvesafb = "options uvesafb mode_option=${UVESA_MODE}"
34 34
35WKS_FILE ?= "directdisk.wks" 35WKS_FILE ?= "qemux86-directdisk.wks"
36do_image_wic[depends] += "syslinux:do_populate_sysroot syslinux-native:do_populate_sysroot mtools-native:do_populate_sysroot dosfstools-native:do_populate_sysroot" 36do_image_wic[depends] += "syslinux:do_populate_sysroot syslinux-native:do_populate_sysroot mtools-native:do_populate_sysroot dosfstools-native:do_populate_sysroot"