mirror of
https://git.yoctoproject.org/poky
synced 2026-04-29 18:32:20 +02:00
fb8aaf6f8e
qemu.inc does a straight assign to MACHINE_FEATURES so overwriting the
preceding append to MACHINE_FEATURES, so the MACHINE_FEATURES append
needs to be moved after the include.
This situation came about as a result of commit 71a4bf386:
qemumachines: Enable xserver-xorg as default xserver
For qemux86 and qemux86-64 include qemu.inc after defining XSERVER
which missed this side-effect (and maybe others).
(From OE-Core rev: 4f336e5f416df382fdd2b405314741164d537b22)
Signed-off-by: Tom Zanussi <tom.zanussi@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
32 lines
753 B
Plaintext
32 lines
753 B
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-dri"
|
|
|
|
require conf/machine/include/tune-i586.inc
|
|
|
|
KERNEL_IMAGETYPE = "bzImage"
|
|
|
|
SERIAL_CONSOLE = "115200 ttyS0"
|
|
|
|
# We bypass swrast but we need it to be present for X to load correctly
|
|
XSERVER ?= "xserver-xorg \
|
|
mesa-dri-driver-swrast \
|
|
xf86-input-vmmouse \
|
|
xf86-input-keyboard \
|
|
xf86-input-evdev \
|
|
xf86-video-vmware \
|
|
qemugl"
|
|
|
|
require conf/machine/include/qemu.inc
|
|
|
|
MACHINE_FEATURES += "x86"
|
|
|
|
GLIBC_ADDONS = "nptl"
|
|
GLIBC_EXTRA_OECONF = "--with-tls"
|
|
|
|
MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "v86d"
|
|
|