From 596a3b61c9ed4fc57dbeb33d2e2a7491364f6d78 Mon Sep 17 00:00:00 2001
From: Rogerio Nunes <rogerio.nunes@freescale.com>
Date: Wed, 31 Jul 2013 17:15:15 -0400
Subject: [PATCH] packagegroup-core-tools-testapps: isolate x11 dependent tools

This patch groups x11 dependent tools in a separete variable,
and when DISTRO_FEATURES does not contain x11, this group is
not included in the package RDEPENDS.

(From OE-Core rev: 8253abeee10189b828336b791c3421d240a2e69b)

Signed-off-by: Rogerio Nunes <rogerio.nunes@freescale.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
 .../packagegroup-core-tools-testapps.bb       | 24 +++++++++++--------
 1 file changed, 14 insertions(+), 10 deletions(-)

diff --git a/meta/recipes-core/packagegroups/packagegroup-core-tools-testapps.bb b/meta/recipes-core/packagegroups/packagegroup-core-tools-testapps.bb
index 343ae1ccd6..1861ebea4c 100644
--- a/meta/recipes-core/packagegroups/packagegroup-core-tools-testapps.bb
+++ b/meta/recipes-core/packagegroups/packagegroup-core-tools-testapps.bb
@@ -24,24 +24,28 @@ KEXECTOOLS_powerpc ?= ""
 KEXECTOOLS_e5500-64b ?= ""
 KEXECTOOLS_aarch64 ?= ""
 
-RDEPENDS_${PN} = "\
-    blktool \
+X11TOOLS = "\
     fstests \
-    tslib-calibrate \
-    tslib-tests \
-    lrzsz \
-    ${KEXECTOOLS} \
-    alsa-utils-amixer \
-    alsa-utils-aplay \
     owl-video \
-    gst-meta-video \
-    gst-meta-audio \
     mesa-demos \
     x11perf \
     xrestop \
     xwininfo \
     xprop \
     xvideo-tests \
+    "
+
+RDEPENDS_${PN} = "\
+    blktool \
+    tslib-calibrate \
+    tslib-tests \
+    lrzsz \
+    ${KEXECTOOLS} \
+    alsa-utils-amixer \
+    alsa-utils-aplay \
+    gst-meta-video \
+    gst-meta-audio \
     ltp \
     connman-client \
+    ${@base_contains('DISTRO_FEATURES', 'x11', "${X11TOOLS}", "", d)} \
     "