summaryrefslogtreecommitdiffstats
path: root/meta/conf/machine/qemux86.conf
diff options
context:
space:
mode:
authorTom Zanussi <tom.zanussi@intel.com>2012-07-01 15:56:12 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-07-04 16:40:37 (GMT)
commitfb8aaf6f8e180cb3fe4c2d02c041cb02be88ab46 (patch)
treed5a8134b317293a56403986dc1f43022ddd5ced9 /meta/conf/machine/qemux86.conf
parentc964536dc91936cf03bcdc3e31c2b4db75f6b49e (diff)
downloadpoky-fb8aaf6f8e180cb3fe4c2d02c041cb02be88ab46.tar.gz
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.conf')
-rw-r--r--meta/conf/machine/qemux86.conf4
1 files changed, 2 insertions, 2 deletions
diff --git a/meta/conf/machine/qemux86.conf b/meta/conf/machine/qemux86.conf
index ad840c0..57e480c 100644
--- a/meta/conf/machine/qemux86.conf
+++ b/meta/conf/machine/qemux86.conf
@@ -7,8 +7,6 @@ PREFERRED_PROVIDER_virtual/libgl ?= "mesa-dri"
7 7
8require conf/machine/include/tune-i586.inc 8require conf/machine/include/tune-i586.inc
9 9
10MACHINE_FEATURES += "x86"
11
12KERNEL_IMAGETYPE = "bzImage" 10KERNEL_IMAGETYPE = "bzImage"
13 11
14SERIAL_CONSOLE = "115200 ttyS0" 12SERIAL_CONSOLE = "115200 ttyS0"
@@ -24,6 +22,8 @@ XSERVER ?= "xserver-xorg \
24 22
25require conf/machine/include/qemu.inc 23require conf/machine/include/qemu.inc
26 24
25MACHINE_FEATURES += "x86"
26
27GLIBC_ADDONS = "nptl" 27GLIBC_ADDONS = "nptl"
28GLIBC_EXTRA_OECONF = "--with-tls" 28GLIBC_EXTRA_OECONF = "--with-tls"
29 29