From cad078c4d07941b009e8496ae7ea3f3a903442ee Mon Sep 17 00:00:00 2001 From: Tom Zanussi Date: Sat, 16 Jun 2012 22:42:49 -0500 Subject: 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 Signed-off-by: Richard Purdie --- .../bsp/substrate/target/arch/qemu/conf/machine/{{=machine}}.conf | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'scripts/lib/bsp') diff --git a/scripts/lib/bsp/substrate/target/arch/qemu/conf/machine/{{=machine}}.conf b/scripts/lib/bsp/substrate/target/arch/qemu/conf/machine/{{=machine}}.conf index 0e4ecadf08..1ab6e58af7 100644 --- a/scripts/lib/bsp/substrate/target/arch/qemu/conf/machine/{{=machine}}.conf +++ b/scripts/lib/bsp/substrate/target/arch/qemu/conf/machine/{{=machine}}.conf @@ -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" -- cgit v1.2.3-54-g00ecf