From 71a4bf386181b3fbc2dc723c781a456a0bbdb943 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Mon, 30 Apr 2012 22:01:24 -0700 Subject: 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 Signed-off-by: Richard Purdie --- meta/conf/machine/qemux86-64.conf | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'meta/conf/machine/qemux86-64.conf') diff --git a/meta/conf/machine/qemux86-64.conf b/meta/conf/machine/qemux86-64.conf index 129fe9f282..2e361a5cab 100644 --- a/meta/conf/machine/qemux86-64.conf +++ b/meta/conf/machine/qemux86-64.conf @@ -6,7 +6,6 @@ PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg" PREFERRED_PROVIDER_virtual/libgl ?= "mesa-dri" require conf/machine/include/tune-x86_64.inc -require conf/machine/include/qemu.inc MACHINE_FEATURES += "x86" @@ -23,6 +22,8 @@ XSERVER ?= "xserver-xorg \ xf86-video-vmware \ qemugl" +require conf/machine/include/qemu.inc + GLIBC_ADDONS = "nptl" GLIBC_EXTRA_OECONF = "--with-tls" -- cgit 1.2.3-korg