summaryrefslogtreecommitdiffstats
path: root/meta/conf/machine/qemux86.conf
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2012-05-01 05:01:24 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-05-24 07:53:56 (GMT)
commit71a4bf386181b3fbc2dc723c781a456a0bbdb943 (patch)
treee7f767a74a9152f51466baa4e6846199080f4fb0 /meta/conf/machine/qemux86.conf
parentbdb158594f83790ea207a3e6b1708faa722d4b74 (diff)
downloadpoky-71a4bf386181b3fbc2dc723c781a456a0bbdb943.tar.gz
qemumachines: Enable xserver-xorg as default xserver
For qemux86 and qemux86-64 include qemu.inc after defining XSERVER XSERVER variable is also weakly defined in task-core-x11.bb which means we can not use ??= otherwise when building any qemu image that uses task-core-x11.bb will get the wrong definition So we define the XSERVER common set for qemu in qemu.inc and as we know x86 and x86-64 qemu overrides the default we include qemu.inc after that definition which means that qemux86 and qemux86-64 get their own definitions and other qemus get the definitions from qemu.inc. other non-qemu machine will get their defintion from task which points to kdrive as of now. (From OE-Core rev: 62dba36166bc5faa32ba3e0664ae98b168cde6b1) Signed-off-by: Khem Raj <raj.khem@gmail.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.conf3
1 files changed, 2 insertions, 1 deletions
diff --git a/meta/conf/machine/qemux86.conf b/meta/conf/machine/qemux86.conf
index 246d5a0..ad840c0 100644
--- a/meta/conf/machine/qemux86.conf
+++ b/meta/conf/machine/qemux86.conf
@@ -6,7 +6,6 @@ PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg"
6PREFERRED_PROVIDER_virtual/libgl ?= "mesa-dri" 6PREFERRED_PROVIDER_virtual/libgl ?= "mesa-dri"
7 7
8require conf/machine/include/tune-i586.inc 8require conf/machine/include/tune-i586.inc
9require conf/machine/include/qemu.inc
10 9
11MACHINE_FEATURES += "x86" 10MACHINE_FEATURES += "x86"
12 11
@@ -23,6 +22,8 @@ XSERVER ?= "xserver-xorg \
23 xf86-video-vmware \ 22 xf86-video-vmware \
24 qemugl" 23 qemugl"
25 24
25require conf/machine/include/qemu.inc
26
26GLIBC_ADDONS = "nptl" 27GLIBC_ADDONS = "nptl"
27GLIBC_EXTRA_OECONF = "--with-tls" 28GLIBC_EXTRA_OECONF = "--with-tls"
28 29