summaryrefslogtreecommitdiffstats
path: root/scripts/lib
diff options
context:
space:
mode:
authorTom Zanussi <tom.zanussi@intel.com>2012-06-16 22:42:49 -0500
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-06-26 15:34:40 +0100
commitcad078c4d07941b009e8496ae7ea3f3a903442ee (patch)
treeaa603868bdd62dcc7a4bbfa7888f9d0b9fe3bb94 /scripts/lib
parent7c03f78a05cf2abb0a6e416edc910022262448f4 (diff)
downloadpoky-cad078c4d07941b009e8496ae7ea3f3a903442ee.tar.gz
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>
Diffstat (limited to 'scripts/lib')
-rw-r--r--scripts/lib/bsp/substrate/target/arch/qemu/conf/machine/{{=machine}}.conf7
1 files changed, 5 insertions, 2 deletions
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 @@
8PREFERRED_PROVIDER_virtual/kernel ?= "{{=preferred_kernel}}" 8PREFERRED_PROVIDER_virtual/kernel ?= "{{=preferred_kernel}}"
9PREFERRED_VERSION_{{=preferred_kernel}} ?= "{{=preferred_kernel_version}}%" 9PREFERRED_VERSION_{{=preferred_kernel}} ?= "{{=preferred_kernel_version}}%"
10 10
11{{ if qemuarch == "i386" or qemuarch == "x86_64": }}
11PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg" 12PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg"
12PREFERRED_PROVIDER_virtual/libgl ?= "mesa-dri" 13PREFERRED_PROVIDER_virtual/libgl ?= "mesa-dri"
13 14
@@ -22,13 +23,14 @@ require conf/machine/include/tune-i586.inc
22{{ if qemuarch == "x86_64": }} 23{{ if qemuarch == "x86_64": }}
23require conf/machine/include/tune-x86_64.inc 24require conf/machine/include/tune-x86_64.inc
24{{ if qemuarch == "arm": }} 25{{ if qemuarch == "arm": }}
26require conf/machine/include/qemu.inc
25require conf/machine/include/tune-arm926ejs.inc 27require conf/machine/include/tune-arm926ejs.inc
26{{ if qemuarch == "powerpc": }} 28{{ if qemuarch == "powerpc": }}
29require conf/machine/include/qemu.inc
27require conf/machine/include/tune-ppc603e.inc 30require conf/machine/include/tune-ppc603e.inc
28{{ if qemuarch == "mips": }} 31{{ if qemuarch == "mips": }}
29require conf/machine/include/tune-mips32.inc
30
31require conf/machine/include/qemu.inc 32require conf/machine/include/qemu.inc
33require conf/machine/include/tune-mips32.inc
32 34
33{{ if qemuarch == "i386" or qemuarch == "x86_64": }} 35{{ if qemuarch == "i386" or qemuarch == "x86_64": }}
34MACHINE_FEATURES += "x86" 36MACHINE_FEATURES += "x86"
@@ -42,6 +44,7 @@ XSERVER ?= "xserver-xorg \
42 xf86-input-evdev \ 44 xf86-input-evdev \
43 xf86-video-vmware \ 45 xf86-video-vmware \
44 qemugl" 46 qemugl"
47require conf/machine/include/qemu.inc
45GLIBC_ADDONS = "nptl" 48GLIBC_ADDONS = "nptl"
46GLIBC_EXTRA_OECONF = "--with-tls" 49GLIBC_EXTRA_OECONF = "--with-tls"
47 50