diff options
| author | Anuj Mittal <anuj.mittal@intel.com> | 2018-05-31 12:34:32 +0800 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-07-02 11:41:25 +0100 |
| commit | 2c63f6bc0e7bead9163fe722e7aaeec3c6d72cd2 (patch) | |
| tree | 961990430809034317de3f226e2765a10bd4d403 /meta/conf | |
| parent | 5c247b9ca746bab710996e88ab7fe77abe2ecea4 (diff) | |
| download | poky-2c63f6bc0e7bead9163fe722e7aaeec3c6d72cd2.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)
(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>
Diffstat (limited to 'meta/conf')
| -rw-r--r-- | meta/conf/machine/qemux86-64.conf | 2 | ||||
| -rw-r--r-- | 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" | |||
| 33 | KERNEL_MODULE_PROBECONF += "uvesafb" | 33 | KERNEL_MODULE_PROBECONF += "uvesafb" |
| 34 | module_conf_uvesafb = "options uvesafb mode_option=${UVESA_MODE}" | 34 | module_conf_uvesafb = "options uvesafb mode_option=${UVESA_MODE}" |
| 35 | 35 | ||
| 36 | WKS_FILE ?= "directdisk.wks" | 36 | WKS_FILE ?= "qemux86-directdisk.wks" |
| 37 | do_image_wic[depends] += "syslinux:do_populate_sysroot syslinux-native:do_populate_sysroot mtools-native:do_populate_sysroot dosfstools-native:do_populate_sysroot" | 37 | 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" | |||
| 32 | KERNEL_MODULE_PROBECONF += "uvesafb" | 32 | KERNEL_MODULE_PROBECONF += "uvesafb" |
| 33 | module_conf_uvesafb = "options uvesafb mode_option=${UVESA_MODE}" | 33 | module_conf_uvesafb = "options uvesafb mode_option=${UVESA_MODE}" |
| 34 | 34 | ||
| 35 | WKS_FILE ?= "directdisk.wks" | 35 | WKS_FILE ?= "qemux86-directdisk.wks" |
| 36 | do_image_wic[depends] += "syslinux:do_populate_sysroot syslinux-native:do_populate_sysroot mtools-native:do_populate_sysroot dosfstools-native:do_populate_sysroot" | 36 | do_image_wic[depends] += "syslinux:do_populate_sysroot syslinux-native:do_populate_sysroot mtools-native:do_populate_sysroot dosfstools-native:do_populate_sysroot" |