Patchwork [v2] packagegroup-core-tools-testapps: Move GLTOOLS to X11GLTOOLS

login
register
mail settings
Submitter Otavio Salvador
Date March 29, 2014, 8:04 p.m.
Message ID <1396123481-6064-1-git-send-email-otavio@ossystems.com.br>
Download mbox | patch
Permalink /patch/69637/
State New
Headers show

Comments

Otavio Salvador - March 29, 2014, 8:04 p.m.
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>
---
 meta/recipes-core/packagegroups/packagegroup-core-tools-testapps.bb | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
Richard Purdie - March 30, 2014, 9:14 a.m.
On Sat, 2014-03-29 at 17:04 -0300, Otavio Salvador wrote:
> 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>
> ---
>  meta/recipes-core/packagegroups/packagegroup-core-tools-testapps.bb | 5 +++--
>  1 file changed, 3 insertions(+), 2 deletions(-)
> 
> diff --git a/meta/recipes-core/packagegroups/packagegroup-core-tools-testapps.bb b/meta/recipes-core/packagegroups/packagegroup-core-tools-testapps.bb
> index d8a7306..0ced119 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,7 @@ RDEPENDS_${PN} = "\
>      connman-tests \
>      connman-client \
>      ${@base_contains('DISTRO_FEATURES', 'x11', "${X11TOOLS}", "", d)} \
> -    ${@base_contains('DISTRO_FEATURES', 'opengl', "${GLTOOLS}", "", d)} \
> +    ${@base_contains('DISTRO_FEATURES', 'opengl', \
> +        base_contains('DISTRO_FEATURES', 'x11', "${X11GLTOOLS}", "", d), "", d)} \

Please just do:

base_contains('DISTRO_FEATURES', 'x11 opengl', "${X11GLTOOLS}", "", d)} 

Cheers,

Richard
Ross Burton - March 31, 2014, 10:14 a.m.
On 29 March 2014 20:04, Otavio Salvador <otavio@ossystems.com.br> wrote:
> 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.

I'm surprised that piglit needs libx11, waffle should be abstracting
that.  I'll have a quick look.

Ross
Otavio Salvador - March 31, 2014, 1:47 p.m.
On Mon, Mar 31, 2014 at 7:14 AM, Burton, Ross <ross.burton@intel.com> wrote:
> On 29 March 2014 20:04, Otavio Salvador <otavio@ossystems.com.br> wrote:
>> 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.
>
> I'm surprised that piglit needs libx11, waffle should be abstracting
> that.  I'll have a quick look.

Could we merge this and then fix piglit? I will send v2 as suggested
by Richard, so we can address this.
Ross Burton - March 31, 2014, 1:54 p.m.
On 31 March 2014 14:47, Otavio Salvador <otavio@ossystems.com.br> wrote:
>> I'm surprised that piglit needs libx11, waffle should be abstracting
>> that.  I'll have a quick look.
>
> Could we merge this and then fix piglit? I will send v2 as suggested
> by Richard, so we can address this.

Sure, this might need a piglit upgrade so would be 1.7 material anyway.

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 d8a7306..0ced119 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,7 @@  RDEPENDS_${PN} = "\
     connman-tests \
     connman-client \
     ${@base_contains('DISTRO_FEATURES', 'x11', "${X11TOOLS}", "", d)} \
-    ${@base_contains('DISTRO_FEATURES', 'opengl', "${GLTOOLS}", "", d)} \
+    ${@base_contains('DISTRO_FEATURES', 'opengl', \
+        base_contains('DISTRO_FEATURES', 'x11', "${X11GLTOOLS}", "", d), "", d)} \
     ${@base_contains('DISTRO_FEATURES', '3g', "${3GTOOLS}", "", d)} \
     "