sysmo-bts
/
generic-poky
9
0
Fork 0
Code Pull Requests Releases Activity

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:
Tom Zanussi 2012-06-16 22:42:49 -05:00 committed by Richard Purdie
parent 7c03f78a05
commit cad078c4d0
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
scripts/lib/bsp/substrate/target/arch/qemu/conf/machine/{{=machine}}.conf
View File

@ -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"