Skip to contentSkip to conversation

packagegroup-core-tools-testapps: isolate x11 dependent tools

PATCH In review [email protected] 4 participants 5 messages Jul 31, 2013 – Aug 1, 2013

lore
Share & tools
lore

[email protected]

author
#0 lore raw

PATCH 1/1 packagegroup-core-tools-testapps: isolate x11 dependent tools

From: Rogerio Nunes <[email protected]>

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 <[email protected]>
---
 .../packagegroup-core-tools-testapps.bb            |   20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)
meta/recipes-core/packagegroups/packagegroup-core-tools-testapps.bb +12 -8
index 343ae1c..1861ebe 100644
@@ -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)} \
     "
Signature · 1 line
1.7.9.5
Acked-by on v1 1/1
#1 lore raw
Quoted 7 lines · On Wed, Jul 31, 2013 at 6:15 PM, <[email protected]> wrote:

From: Rogerio Nunes <[email protected]>

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 <[email protected]>
Acked-by Otavio Salvador <[email protected]>
Signature · 3 lines
Otavio Salvador                             O.S. Systems
http://www.ossystems.com.br        http://projetos.ossystems.com.br
Mobile: +55 (53) 9981-7854            Mobile: +1 (347) 903-9750
#3 lore raw
Quoted 5 lines · Ross
Quoted 1 line · On 31 July 2013 22:15, <[email protected]> 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).

Signature · 1 line
Martin 'JaMa' Jansa     jabber: [email protected]
#4 lore raw
Quoted 9 lines · Martin Jansa
Quoted 2 lines

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