[oe-commits] [openembedded-core] 14/68: qemux86*: change default wic wks to qemux86-directdisk

[git at git.openembedded.org]

This is an automated email from the git hooks/post-receive script.

rpurdie pushed a commit to branch sumo
in repository openembedded-core.

commit d22318def2af68f7c8b82605ba3fda8fcfcc9d0a
Author: Anuj Mittal <anuj.mittal at intel.com>
AuthorDate: Thu May 31 12:34:32 2018 +0800

    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 at intel.com>
    Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
    Signed-off-by: Armin Kuster <akuster808 at gmail.com>
---
 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 fcc4459..2330c7d 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 c53f7a9..811e3ef 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"

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.