diff options
| author | Saul Wold <sgw@linux.intel.com> | 2012-05-11 10:13:06 -0700 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-05-24 08:53:57 +0100 |
| commit | 9180d38c4750340f6ce7807486505c7190fb3daf (patch) | |
| tree | d1721e0f1529b94c50974c59b149ba885334c3db /meta/conf | |
| parent | f83cdef08fed4f2a0612f9422fb21348cd589d8a (diff) | |
| download | poky-9180d38c4750340f6ce7807486505c7190fb3daf.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.
(From OE-Core rev: cf8b4b95c6d84c097f4fc63662f181a59e0f9cb9)
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/conf')
| -rw-r--r-- | 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 e384879a8f..5d59a7fc02 100644 --- a/meta/conf/machine/include/qemu.inc +++ b/meta/conf/machine/include/qemu.inc | |||
| @@ -1,6 +1,5 @@ | |||
| 1 | PCMCIA_MANAGER = "pcmciautils" | 1 | PCMCIA_MANAGER = "pcmciautils" |
| 2 | PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg" | 2 | PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg" |
| 3 | PREFERRED_PROVIDER_virtual/libgl ?= "mesa-xlib" | ||
| 4 | 3 | ||
| 5 | XSERVER ?= "xserver-xorg \ | 4 | XSERVER ?= "xserver-xorg \ |
| 6 | mesa-dri-driver-swrast \ | 5 | mesa-dri-driver-swrast \ |