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

[Richard Purdie]

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 at 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