* [PATCH v2] packagegroup-core-tools-testapps: Move GLTOOLS to X11GLTOOLS
@ 2014-03-29 20:04 Otavio Salvador
2014-03-30 9:14 ` Richard Purdie
2014-03-31 10:14 ` Burton, Ross
0 siblings, 2 replies; 5+ messages in thread
From: Otavio Salvador @ 2014-03-29 20:04 UTC (permalink / raw)
To: OpenEmbedded Core Mailing List; +Cc: Otavio Salvador
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)} \
${@base_contains('DISTRO_FEATURES', '3g', "${3GTOOLS}", "", d)} \
"
--
1.9.1
^ permalink raw reply related [flat|nested] 5+ messages in thread* Re: [PATCH v2] packagegroup-core-tools-testapps: Move GLTOOLS to X11GLTOOLS
2014-03-29 20:04 [PATCH v2] packagegroup-core-tools-testapps: Move GLTOOLS to X11GLTOOLS Otavio Salvador
@ 2014-03-30 9:14 ` Richard Purdie
2014-03-31 10:14 ` Burton, Ross
1 sibling, 0 replies; 5+ messages in thread
From: Richard Purdie @ 2014-03-30 9:14 UTC (permalink / raw)
To: Otavio Salvador; +Cc: OpenEmbedded Core Mailing List
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
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [PATCH v2] packagegroup-core-tools-testapps: Move GLTOOLS to X11GLTOOLS
2014-03-29 20:04 [PATCH v2] packagegroup-core-tools-testapps: Move GLTOOLS to X11GLTOOLS Otavio Salvador
2014-03-30 9:14 ` Richard Purdie
@ 2014-03-31 10:14 ` Burton, Ross
2014-03-31 13:47 ` Otavio Salvador
1 sibling, 1 reply; 5+ messages in thread
From: Burton, Ross @ 2014-03-31 10:14 UTC (permalink / raw)
To: Otavio Salvador; +Cc: OpenEmbedded Core Mailing List
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
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH v2] packagegroup-core-tools-testapps: Move GLTOOLS to X11GLTOOLS
2014-03-31 10:14 ` Burton, Ross
@ 2014-03-31 13:47 ` Otavio Salvador
2014-03-31 13:54 ` Burton, Ross
0 siblings, 1 reply; 5+ messages in thread
From: Otavio Salvador @ 2014-03-31 13:47 UTC (permalink / raw)
To: Burton, Ross; +Cc: OpenEmbedded Core Mailing List
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.
--
Otavio Salvador O.S. Systems
http://www.ossystems.com.br http://code.ossystems.com.br
Mobile: +55 (53) 9981-7854 Mobile: +1 (347) 903-9750
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2014-03-31 13:55 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-03-29 20:04 [PATCH v2] packagegroup-core-tools-testapps: Move GLTOOLS to X11GLTOOLS Otavio Salvador
2014-03-30 9:14 ` Richard Purdie
2014-03-31 10:14 ` Burton, Ross
2014-03-31 13:47 ` Otavio Salvador
2014-03-31 13:54 ` Burton, Ross
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox