Patchwork [master,dylan] packagegroup-core-tools-testapps: isolate x11 dependent tools

login
register
mail settings
Submitter Rogerio Nunes
Date July 31, 2013, 9:15 p.m.
Message ID <1375305315-22057-1-git-send-email-ronunes@gmail.com>
Download mbox | patch
Permalink /patch/54887/
State Accepted
Commit 8253abeee10189b828336b791c3421d240a2e69b
Headers show

Comments

Rogerio Nunes - July 31, 2013, 9:15 p.m.
From: Rogerio Nunes <rogerio.nunes@freescale.com>

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.

Signed-off-by: Rogerio Nunes <rogerio.nunes@freescale.com>
---
 .../packagegroup-core-tools-testapps.bb            |   20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)
Otavio Salvador - Aug. 1, 2013, 1:16 a.m.
On Wed, Jul 31, 2013 at 6:15 PM,  <ronunes@gmail.com> wrote:
> From: Rogerio Nunes <rogerio.nunes@freescale.com>
>
> 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.
>
> Signed-off-by: Rogerio Nunes <rogerio.nunes@freescale.com>

Acked-by: Otavio Salvador <otavio@ossystems.com.br>
Ross Burton - Aug. 1, 2013, 9:50 a.m.
On 31 July 2013 22:15,  <ronunes@gmail.com> wrote:
> +    mesa-demos \

If no x11 distro feature then mesa shouldn't be linking against X, so
mesa-demos won't, so this should work, right?

Ross
Martin Jansa - Aug. 1, 2013, 10:41 a.m.
On Thu, Aug 01, 2013 at 10:50:28AM +0100, Burton, Ross wrote:
> On 31 July 2013 22:15,  <ronunes@gmail.com> wrote:
> > +    mesa-demos \
> 
> If no x11 distro feature then mesa shouldn't be linking against X, so
> mesa-demos won't, so this should work, right?

mesa-demos need glew and glew needs virtual/libx11

Unfortunately mesa-demos autoconf stuff doesn't allow to disable demos
which are depending on glew, we're using ugly hacks to remove glew
dependency and build mesa-demos only with few demos available without
x11 in DISTRO_FEATURES (only egl subdir).
Ross Burton - Aug. 1, 2013, 10:45 a.m.
On 1 August 2013 11:41, Martin Jansa <martin.jansa@gmail.com> wrote:
>> If no x11 distro feature then mesa shouldn't be linking against X, so
>> mesa-demos won't, so this should work, right?
>
> mesa-demos need glew and glew needs virtual/libx11
>
> Unfortunately mesa-demos autoconf stuff doesn't allow to disable demos
> which are depending on glew, we're using ugly hacks to remove glew
> dependency and build mesa-demos only with few demos available without
> x11 in DISTRO_FEATURES (only egl subdir).

Damn, oh well. --without-glew is something to push upstream correctly
one day then.

Ross

Patch

diff --git a/meta/recipes-core/packagegroups/packagegroup-core-tools-testapps.bb b/meta/recipes-core/packagegroups/packagegroup-core-tools-testapps.bb
index 343ae1c..1861ebe 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 ?= ""
 
+X11TOOLS = "\
+    fstests \
+    owl-video \
+    mesa-demos \
+    x11perf \
+    xrestop \
+    xwininfo \
+    xprop \
+    xvideo-tests \
+    "
+
 RDEPENDS_${PN} = "\
     blktool \
-    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 \
     ltp \
     connman-client \
+    ${@base_contains('DISTRO_FEATURES', 'x11', "${X11TOOLS}", "", d)} \
     "