From: Otavio Salvador <otavio@ossystems.com.br>
Date: Mon, 31 Mar 2014 14:03:09 +0000 (-0300)
Subject: packagegroup-core-tools-testapps: Move GLTOOLS to X11GLTOOLS
X-Git-Tag: lucaceresoli/bug-15201-perf-libtraceevent-missing~34001
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ab0bb02d410e4f0713e75192eb217991b3f672aa;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git

packagegroup-core-tools-testapps: Move GLTOOLS to X11GLTOOLS

piglit and mesa-demos are not buildable in x11-less distros so we must
to add those only when opengl and x11 DISTRO_FEATURES are available.

Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---

diff --git a/meta/recipes-core/packagegroups/packagegroup-core-tools-testapps.bb b/meta/recipes-core/packagegroups/packagegroup-core-tools-testapps.bb
index d8a7306ed43..952fbd0d1a5 100644
--- a/meta/recipes-core/packagegroups/packagegroup-core-tools-testapps.bb
+++ b/meta/recipes-core/packagegroups/packagegroup-core-tools-testapps.bb
@@ -24,7 +24,7 @@ KEXECTOOLS_powerpc ?= ""
 KEXECTOOLS_e5500-64b ?= ""
 KEXECTOOLS_aarch64 ?= ""
 
-GLTOOLS = "\
+X11GLTOOLS = "\
     mesa-demos \
     piglit \
     "
@@ -58,6 +58,6 @@ RDEPENDS_${PN} = "\
     connman-tests \
     connman-client \
     ${@base_contains('DISTRO_FEATURES', 'x11', "${X11TOOLS}", "", d)} \
-    ${@base_contains('DISTRO_FEATURES', 'opengl', "${GLTOOLS}", "", d)} \
+    ${@base_contains('DISTRO_FEATURES', 'x11 opengl', "${X11GLTOOLS}", "", d)} \
     ${@base_contains('DISTRO_FEATURES', '3g', "${3GTOOLS}", "", d)} \
     "