summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard Purdie <rpurdie@linux.intel.com>2009-01-27 13:23:10 +0000
committerRichard Purdie <rpurdie@linux.intel.com>2009-01-27 13:23:10 +0000
commitdeadb5259f307aaad70c5cb2ed9b60ff13a52bac (patch)
treecb6c4a673887e407383c5c9c42723656d77646e9
parente1d6280a61f34b68279eb9e2cb95f0f77f0f0df4 (diff)
downloadopenembedded-core-deadb5259f307aaad70c5cb2ed9b60ff13a52bac.tar.gz
openembedded-core-deadb5259f307aaad70c5cb2ed9b60ff13a52bac.tar.bz2
openembedded-core-deadb5259f307aaad70c5cb2ed9b60ff13a52bac.tar.xz
openembedded-core-deadb5259f307aaad70c5cb2ed9b60ff13a52bac.zip
mesa: Exclude mesa packages from world builds to reduce breakage
-rw-r--r--meta/packages/mesa/mesa-common.inc3
-rw-r--r--meta/packages/mesa/mesa_7.0.2.bb3
-rw-r--r--meta/packages/mesa/qemugl_git.bb3
3 files changed, 9 insertions, 0 deletions
diff --git a/meta/packages/mesa/mesa-common.inc b/meta/packages/mesa/mesa-common.inc
index cb112df01..28fde0d1e 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 a4616ee41..b64fbaf8b 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 f267d0c32..e35871fda 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}/