aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSaul Wold <sgw@linux.intel.com>2012-05-11 10:13:06 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-05-24 08:53:40 +0100
commitcf8b4b95c6d84c097f4fc63662f181a59e0f9cb9 (patch)
treea3fc3d3f26c92a15d8ca91783f533a00c095af90
parentdb0defb1d019a0e7c06d37dacc09842174e2f548 (diff)
downloadopenembedded-core-cf8b4b95c6d84c097f4fc63662f181a59e0f9cb9.tar.gz
qemu.inc: Remove mesa-xlib as PREFERRED_PROVIDER
The xserver-xorg uses and depends on mesa-dri, so we should use the default PREFERRED_PROVIDER of libgl as mesa-dri. This resolves the following: ERROR: Multiple .bb files are due to be built which each provide virtual/libgl (/intel/poky/distro/meta/recipes-graphics/mesa/mesa-dri_7.11.bb /intel/poky/distro/meta/recipes-graphics/mesa/mesa-xlib_7.11.bb). This usually means one provides something the other doesn't and should. Signed-off-by: Saul Wold <sgw@linux.intel.com>
-rw-r--r--meta/conf/machine/include/qemu.inc1
1 files changed, 0 insertions, 1 deletions
diff --git a/meta/conf/machine/include/qemu.inc b/meta/conf/machine/include/qemu.inc
index e384879a8f..5d59a7fc02 100644
--- a/meta/conf/machine/include/qemu.inc
+++ b/meta/conf/machine/include/qemu.inc
@@ -1,6 +1,5 @@
PCMCIA_MANAGER = "pcmciautils"
PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg"
-PREFERRED_PROVIDER_virtual/libgl ?= "mesa-xlib"
XSERVER ?= "xserver-xorg \
mesa-dri-driver-swrast \