| Submitter | Saul Wold |
|---|---|
| Date | May 11, 2012, 5:21 p.m. |
| Message ID | <b975d620a125ac0faa5af46cca33243f1d5d473d.1336756650.git.sgw@linux.intel.com> |
| Download | mbox | patch |
| Permalink | /patch/27487/ |
| State | Accepted |
| Commit | cf8b4b95c6d84c097f4fc63662f181a59e0f9cb9 |
| Headers | show |
Comments
Patch
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 \
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> --- meta/conf/machine/include/qemu.inc | 1 - 1 files changed, 0 insertions(+), 1 deletions(-)