qemu.inc: Remove mesa-xlib as PREFERRED_PROVIDER
authorSaul Wold <sgw@linux.intel.com>
Fri, 11 May 2012 17:13:06 +0000 (10:13 -0700)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Thu, 24 May 2012 07:53:57 +0000 (08:53 +0100)
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.

(From OE-Core rev: cf8b4b95c6d84c097f4fc63662f181a59e0f9cb9)

Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
meta/conf/machine/include/qemu.inc

index e384879..5d59a7f 100644 (file)
@@ -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 \