mesa: Exclude mesa packages from world builds to reduce breakage

3 files changed, 9 insertions, 0 deletions

diff --git a/meta/packages/mesa/mesa-common.inc b/meta/packages/mesa/mesa-common.inc
index cb112df012..28fde0d1ee 100644
--- a/meta/packages/mesa/mesa-common.inc
+++ b/meta/packages/mesa/mesa-common.inc
@@ -17,4 +17,7 @@ EXTRA_OECONF = "--disable-glu \
                 --disable-glut \
                 --enable-glx-tls"
 
+# Multiple virtual/gl providers being built breaks staging
+EXCLUDE_FROM_WORLD = "1"
+
 
diff --git a/meta/packages/mesa/mesa_7.0.2.bb b/meta/packages/mesa/mesa_7.0.2.bb
index a4616ee412..b64fbaf8b3 100644
--- a/meta/packages/mesa/mesa_7.0.2.bb
+++ b/meta/packages/mesa/mesa_7.0.2.bb
@@ -22,6 +22,9 @@ FILES_libosmesa-dev = "${libdir}/libOSMesa.* ${includedir}/osmesa.h"
 
 ALLOW_EMPTY_${PN} = "1"
 
+# Multiple virtual/gl providers being built breaks staging
+EXCLUDE_FROM_WORLD = "1"
+
 do_configure() {
         cd configs
 
diff --git a/meta/packages/mesa/qemugl_git.bb b/meta/packages/mesa/qemugl_git.bb
index f267d0c32c..e35871fda8 100644
--- a/meta/packages/mesa/qemugl_git.bb
+++ b/meta/packages/mesa/qemugl_git.bb
@@ -17,6 +17,9 @@ PROVIDES = "virtual/libgl"
 
 DEFAULT_PREFERENCE = "-1"
 
+# Multiple virtual/gl providers being built breaks staging
+EXCLUDE_FROM_WORLD = "1"
+
 do_install () {
         install -d ${D}${libdir}
         install -m 0755 ${S}/libGL.so ${D}${libdir}/