yocto-bsp: update yocto-bsp machine.conf template
Some changes in the ordering assumptions of the qemu include rendered X inoperative, fix those in the qemu machine template. Fixes [YOCTO #2559] (From meta-yocto rev: c3d208267dea6bc0f8be2eb9c63b4125730bb21b) Signed-off-by: Tom Zanussi <tom.zanussi@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
parent
7c03f78a05
commit
cad078c4d0
|
@ -8,6 +8,7 @@
|
|||
PREFERRED_PROVIDER_virtual/kernel ?= "{{=preferred_kernel}}"
|
||||
PREFERRED_VERSION_{{=preferred_kernel}} ?= "{{=preferred_kernel_version}}%"
|
||||
|
||||
{{ if qemuarch == "i386" or qemuarch == "x86_64": }}
|
||||
PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg"
|
||||
PREFERRED_PROVIDER_virtual/libgl ?= "mesa-dri"
|
||||
|
||||
|
@ -22,13 +23,14 @@ require conf/machine/include/tune-i586.inc
|
|||
{{ if qemuarch == "x86_64": }}
|
||||
require conf/machine/include/tune-x86_64.inc
|
||||
{{ if qemuarch == "arm": }}
|
||||
require conf/machine/include/qemu.inc
|
||||
require conf/machine/include/tune-arm926ejs.inc
|
||||
{{ if qemuarch == "powerpc": }}
|
||||
require conf/machine/include/qemu.inc
|
||||
require conf/machine/include/tune-ppc603e.inc
|
||||
{{ if qemuarch == "mips": }}
|
||||
require conf/machine/include/tune-mips32.inc
|
||||
|
||||
require conf/machine/include/qemu.inc
|
||||
require conf/machine/include/tune-mips32.inc
|
||||
|
||||
{{ if qemuarch == "i386" or qemuarch == "x86_64": }}
|
||||
MACHINE_FEATURES += "x86"
|
||||
|
@ -42,6 +44,7 @@ XSERVER ?= "xserver-xorg \
|
|||
xf86-input-evdev \
|
||||
xf86-video-vmware \
|
||||
qemugl"
|
||||
require conf/machine/include/qemu.inc
|
||||
GLIBC_ADDONS = "nptl"
|
||||
GLIBC_EXTRA_OECONF = "--with-tls"
|
||||
|
||||
|
|
Loading…
Reference in New Issue