mirror of
https://git.yoctoproject.org/poky
synced 2026-04-28 06:32:34 +02:00
693638fd5d
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>
37 lines
1.2 KiB
Plaintext
37 lines
1.2 KiB
Plaintext
#@TYPE: Machine
|
|
#@NAME: common_pc
|
|
#@DESCRIPTION: Machine configuration for running a common x86
|
|
|
|
PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg"
|
|
PREFERRED_PROVIDER_virtual/libgl ?= "mesa"
|
|
PREFERRED_PROVIDER_virtual/libgles1 ?= "mesa"
|
|
PREFERRED_PROVIDER_virtual/libgles2 ?= "mesa"
|
|
|
|
require conf/machine/include/qemu.inc
|
|
require conf/machine/include/tune-i586.inc
|
|
require conf/machine/include/qemuboot-x86.inc
|
|
|
|
KERNEL_IMAGETYPE = "bzImage"
|
|
|
|
SERIAL_CONSOLES ?= "115200;ttyS0 115200;ttyS1"
|
|
|
|
XSERVER = "xserver-xorg \
|
|
${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'mesa-driver-swrast xserver-xorg-extension-glx', '', d)} \
|
|
xf86-video-cirrus \
|
|
xf86-video-fbdev \
|
|
xf86-video-vmware \
|
|
xf86-video-modesetting \
|
|
xserver-xorg-module-libint10 \
|
|
"
|
|
|
|
MACHINE_FEATURES += "x86 pci"
|
|
|
|
MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "v86d"
|
|
|
|
KERNEL_MODULE_AUTOLOAD += "uvesafb"
|
|
KERNEL_MODULE_PROBECONF += "uvesafb"
|
|
module_conf_uvesafb = "options uvesafb mode_option=${UVESA_MODE}"
|
|
|
|
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"
|