aboutsummaryrefslogtreecommitdiffstats
path: root/meta/conf/machine/qemux86-64.conf
diff options
context:
space:
mode:
authorTom Zanussi <tom.zanussi@intel.com>2012-07-01 10:56:12 -0500
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-07-04 17:40:37 +0100
commitfb8aaf6f8e180cb3fe4c2d02c041cb02be88ab46 (patch)
treed5a8134b317293a56403986dc1f43022ddd5ced9 /meta/conf/machine/qemux86-64.conf
parentc964536dc91936cf03bcdc3e31c2b4db75f6b49e (diff)
downloadopenembedded-core-contrib-fb8aaf6f8e180cb3fe4c2d02c041cb02be88ab46.tar.gz
openembedded-core-contrib-fb8aaf6f8e180cb3fe4c2d02c041cb02be88ab46.tar.bz2
openembedded-core-contrib-fb8aaf6f8e180cb3fe4c2d02c041cb02be88ab46.zip
qemumachines: make MACHINE_FEATURES append follow qemu.inc include
qemu.inc does a straight assign to MACHINE_FEATURES so overwriting the preceding append to MACHINE_FEATURES, so the MACHINE_FEATURES append needs to be moved after the include. This situation came about as a result of commit 71a4bf386: qemumachines: Enable xserver-xorg as default xserver For qemux86 and qemux86-64 include qemu.inc after defining XSERVER which missed this side-effect (and maybe others). (From OE-Core rev: 4f336e5f416df382fdd2b405314741164d537b22) Signed-off-by: Tom Zanussi <tom.zanussi@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/conf/machine/qemux86-64.conf')
-rw-r--r--meta/conf/machine/qemux86-64.conf4
1 files changed, 2 insertions, 2 deletions
diff --git a/meta/conf/machine/qemux86-64.conf b/meta/conf/machine/qemux86-64.conf
index 2e361a5cab..998ef60401 100644
--- a/meta/conf/machine/qemux86-64.conf
+++ b/meta/conf/machine/qemux86-64.conf
@@ -7,8 +7,6 @@ PREFERRED_PROVIDER_virtual/libgl ?= "mesa-dri"
require conf/machine/include/tune-x86_64.inc
-MACHINE_FEATURES += "x86"
-
KERNEL_IMAGETYPE = "bzImage"
SERIAL_CONSOLE = "115200 ttyS0"
@@ -24,6 +22,8 @@ XSERVER ?= "xserver-xorg \
require conf/machine/include/qemu.inc
+MACHINE_FEATURES += "x86"
+
GLIBC_ADDONS = "nptl"
GLIBC_EXTRA_OECONF = "--with-tls"