From: Saul Wold Date: Fri, 11 May 2012 17:13:06 +0000 (-0700) Subject: qemu.inc: Remove mesa-xlib as PREFERRED_PROVIDER X-Git-Tag: 2015-4~10560 X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=cf8b4b95c6d84c097f4fc63662f181a59e0f9cb9;p=openembedded-core.git 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 --- 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 \