mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-04-15 21:32:13 +02:00
Code Issues Packages Projects Releases Wiki Activity

qemux86*: change default wic wks to qemux86-directdisk

Browse Source 
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)

(From OE-Core rev: d22318def2af68f7c8b82605ba3fda8fcfcc9d0a)

Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Anuj Mittal
2018-05-31 12:34:32 +08:00
committed by Richard Purdie
parent 5c247b9ca7
commit 2c63f6bc0e
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
meta/conf/machine/qemux86-64.conf
View File

@@ -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"

2
meta/conf/machine/qemux86.conf
View File

@@ -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"