diff options
| author | Tom Zanussi <tom.zanussi@intel.com> | 2012-06-16 22:42:49 -0500 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-06-26 15:34:40 +0100 |
| commit | cad078c4d07941b009e8496ae7ea3f3a903442ee (patch) | |
| tree | aa603868bdd62dcc7a4bbfa7888f9d0b9fe3bb94 /scripts/lib | |
| parent | 7c03f78a05cf2abb0a6e416edc910022262448f4 (diff) | |
| download | ast2050-yocto-poky-cad078c4d07941b009e8496ae7ea3f3a903442ee.zip ast2050-yocto-poky-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}}.conf | 7 |
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 0e4ecad..1ab6e58 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" |
