From patchwork Wed May 23 22:46:14 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [Consolidated, Pull, 3/5] qemu.inc: Remove mesa-xlib as PREFERRED_PROVIDER Date: Wed, 23 May 2012 22:46:14 -0000 From: Saul Wold X-Patchwork-Id: 28497 Message-Id: <0d668482e909fcaa44d08ec9fcee59c5f219af5f.1337805812.git.sgw@linux.intel.com> To: openembedded-core@lists.openembedded.org 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 --- meta/conf/machine/include/qemu.inc | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/meta/conf/machine/include/qemu.inc b/meta/conf/machine/include/qemu.inc index e384879..5d59a7f 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 \