summaryrefslogtreecommitdiffstats
path: root/meta/conf/machine
diff options
context:
space:
mode:
authorJoshua Lock <josh@linux.intel.com>2010-02-10 14:27:21 +0000
committerJoshua Lock <josh@linux.intel.com>2010-02-10 14:34:15 +0000
commitbf422fcfff1e5e1b635782ae3c896c9318190159 (patch)
tree888b93f21a28b28d5df44dca7091c996e0e7faad /meta/conf/machine
parent62ab7dac395c5f254606ca20aae43c1f3bb3b27e (diff)
downloadpoky-bf422fcfff1e5e1b635782ae3c896c9318190159.tar.gz
qemux86: fix setting of preferred provider for virtual/xserver
Change the virtual/xserver preferred provider in qemu.inc to a soft assign and set preferred provider in qemux86 before the require so that the value is retained. Signed-off-by: Joshua Lock <josh@linux.intel.com>
Diffstat (limited to 'meta/conf/machine')
-rw-r--r--meta/conf/machine/include/qemu.inc2
-rw-r--r--meta/conf/machine/qemux86.conf13
2 files changed, 8 insertions, 7 deletions
diff --git a/meta/conf/machine/include/qemu.inc b/meta/conf/machine/include/qemu.inc
index 1379cdd855..cba8576612 100644
--- a/meta/conf/machine/include/qemu.inc
+++ b/meta/conf/machine/include/qemu.inc
@@ -1,5 +1,5 @@
1PCMCIA_MANAGER = "pcmciautils" 1PCMCIA_MANAGER = "pcmciautils"
2PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive" 2PREFERRED_PROVIDER_virtual/xserver ?= "xserver-kdrive"
3GUI_MACHINE_CLASS = "bigscreen" 3GUI_MACHINE_CLASS = "bigscreen"
4GPE_EXTRA_INSTALL += "gaim sylpheed" 4GPE_EXTRA_INSTALL += "gaim sylpheed"
5 5
diff --git a/meta/conf/machine/qemux86.conf b/meta/conf/machine/qemux86.conf
index d5c5ff9ec6..7f982b2ce6 100644
--- a/meta/conf/machine/qemux86.conf
+++ b/meta/conf/machine/qemux86.conf
@@ -5,6 +5,13 @@
5TARGET_ARCH = "i586" 5TARGET_ARCH = "i586"
6PACKAGE_EXTRA_ARCHS = "x86" 6PACKAGE_EXTRA_ARCHS = "x86"
7 7
8PREFERRED_PROVIDER_virtual/kernel = "linux-rp"
9PREFERRED_PROVIDER_virtual/libgl = "mesa-dri"
10PREFERRED_PROVIDER_virtual/kernel ?= "linux-moblin"
11PREFERRED_PROVIDER_virtual/libx11 ?= "libx11-trim"
12PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xf86-dri-lite"
13PREFERRED_PROVIDER_virtual/xserver-xf86 ?= "xserver-xf86-dri-lite"
14
8require conf/machine/include/qemu.inc 15require conf/machine/include/qemu.inc
9 16
10MACHINE_FEATURES += "x86" 17MACHINE_FEATURES += "x86"
@@ -13,12 +20,6 @@ KERNEL_IMAGETYPE = "bzImage"
13 20
14SERIAL_CONSOLE = "115200 ttyS0" 21SERIAL_CONSOLE = "115200 ttyS0"
15 22
16PREFERRED_PROVIDER_virtual/kernel = "linux-rp"
17PREFERRED_PROVIDER_virtual/libgl = "mesa-dri"
18PREFERRED_PROVIDER_virtual/kernel ?= "linux-moblin"
19PREFERRED_PROVIDER_virtual/libx11 ?= "libx11-trim"
20PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xf86-dri-lite"
21PREFERRED_PROVIDER_virtual/xserver-xf86 ?= "xserver-xf86-dri-lite"
22# We bypass swrast but we need it to be present for X to load correctly 23# We bypass swrast but we need it to be present for X to load correctly
23XSERVER ?= "xserver-xf86-dri-lite \ 24XSERVER ?= "xserver-xf86-dri-lite \
24 mesa-dri-driver-swrast \ 25 mesa-dri-driver-swrast \