<div dir="ltr"><div>-dbg and -src packages are unlikely to be shipped to customers. How about either whitelisting them globally, or setting INCOMPABIBLE_LICENSE per image?</div><div><br></div><div>What the patch does with LICENSE-dbg/src feels hack-ish to be honest; also there are other recipes with a similar layout which would also need similar fixups.<br></div><div><br></div><div>Alex<br></div></div><br><div class="gmail_quote"><div dir="ltr" class="gmail_attr">On Sun, 22 Dec 2019 at 14:01, Peter Kjellerstedt <<a href="mailto:peter.kjellerstedt@axis.com">peter.kjellerstedt@axis.com</a>> wrote:<br></div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex">*ping*<br>
<br>
//Peter<br>
<br>
> -----Original Message-----<br>
> From: <a href="mailto:openembedded-core-bounces@lists.openembedded.org" target="_blank">openembedded-core-bounces@lists.openembedded.org</a> <openembedded-core-<br>
> <a href="mailto:bounces@lists.openembedded.org" target="_blank">bounces@lists.openembedded.org</a>> On Behalf Of Peter Kjellerstedt<br>
> Sent: den 5 december 2019 23:26<br>
> To: <a href="mailto:openembedded-core@lists.openembedded.org" target="_blank">openembedded-core@lists.openembedded.org</a><br>
> Subject: [OE-core] [master][zeus][PATCH] cairo: Adapt license for cairo-<br>
> dbg and cairo-src based on contents<br>
> <br>
> Introduce a PACKAGECONFIG "trace" to disable cairo-trace (the only<br>
> part of the code licensed as GPL-3.0, and which is normally packaged<br>
> separately in cairo-perf-utils). By disabling this, we can adapt the<br>
> licenses for cairo-dbg and cairo-src so that they do not include<br>
> "GPLv3+" when trace is disabled and thus they can be used also when,<br>
> e.g., GPL-3.0 is blacklisted in INCOMPATIBLE_LICENSE.<br>
> <br>
> The "trace" PACKAGECONFIG is enabled by default for backwards<br>
> compatibility.<br>
> <br>
> Signed-off-by: Peter Kjellerstedt <<a href="mailto:peter.kjellerstedt@axis.com" target="_blank">peter.kjellerstedt@axis.com</a>><br>
> ---<br>
> meta/recipes-graphics/cairo/<a href="http://cairo_1.16.0.bb" rel="noreferrer" target="_blank">cairo_1.16.0.bb</a> | 8 +++++++-<br>
> 1 file changed, 7 insertions(+), 1 deletion(-)<br>
> <br>
> diff --git a/meta/recipes-graphics/cairo/<a href="http://cairo_1.16.0.bb" rel="noreferrer" target="_blank">cairo_1.16.0.bb</a> b/meta/recipes-<br>
> graphics/cairo/<a href="http://cairo_1.16.0.bb" rel="noreferrer" target="_blank">cairo_1.16.0.bb</a><br>
> index e3de3f6164..36a7b3c180 100644<br>
> --- a/meta/recipes-graphics/cairo/<a href="http://cairo_1.16.0.bb" rel="noreferrer" target="_blank">cairo_1.16.0.bb</a><br>
> +++ b/meta/recipes-graphics/cairo/<a href="http://cairo_1.16.0.bb" rel="noreferrer" target="_blank">cairo_1.16.0.bb</a><br>
> @@ -17,6 +17,10 @@ LICENSE_${PN}-doc = "MPL-1.1 | LGPLv2.1"<br>
> LICENSE_${PN}-gobject = "MPL-1.1 | LGPLv2.1"<br>
> LICENSE_${PN}-script-interpreter = "MPL-1.1 | LGPLv2.1"<br>
> LICENSE_${PN}-perf-utils = "GPLv3+"<br>
> +# Adapt the licenses for cairo-dbg and cairo-src depending on whether<br>
> +# cairo-trace is being built.<br>
> +LICENSE_${PN}-dbg = "(MPL-1.1 |<br>
> LGPLv2.1)${@bb.utils.contains('PACKAGECONFIG', 'trace', ' & GPLv3+', '',<br>
> d)}"<br>
> +LICENSE_${PN}-src = "(MPL-1.1 |<br>
> LGPLv2.1)${@bb.utils.contains('PACKAGECONFIG', 'trace', ' & GPLv3+', '',<br>
> d)}"<br>
> <br>
> LIC_FILES_CHKSUM = "file://COPYING;md5=e73e999e0c72b5ac9012424fa157ad77"<br>
> <br>
> @@ -40,7 +44,8 @@ X11DEPENDS = "virtual/libx11 libsm libxrender libxext"<br>
> <br>
> PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'directfb', d)}<br>
> \<br>
> ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11<br>
> xcb', '', d)} \<br>
> - ${@bb.utils.contains('DISTRO_FEATURES', 'x11 opengl',<br>
> 'opengl', '', d)}"<br>
> + ${@bb.utils.contains('DISTRO_FEATURES', 'x11 opengl',<br>
> 'opengl', '', d)} \<br>
> + trace"<br>
> <br>
> PACKAGECONFIG[x11] = "--with-x=yes -enable-xlib,--with-x=no --disable-<br>
> xlib,${X11DEPENDS}"<br>
> PACKAGECONFIG[xcb] = "--enable-xcb,--disable-xcb,libxcb"<br>
> @@ -49,6 +54,7 @@ PACKAGECONFIG[valgrind] = "--enable-valgrind=yes,--<br>
> disable-valgrind,valgrind"<br>
> PACKAGECONFIG[egl] = "--enable-egl=yes,--disable-egl,virtual/egl"<br>
> PACKAGECONFIG[glesv2] = "--enable-glesv2,--disable-<br>
> glesv2,virtual/libgles2"<br>
> PACKAGECONFIG[opengl] = "--enable-gl,--disable-gl,virtual/libgl"<br>
> +PACKAGECONFIG[trace] = "--enable-trace,--disable-trace"<br>
> <br>
> EXTRA_OECONF += " \<br>
> ${@bb.utils.contains('TARGET_FPU', 'soft', '--disable-some-floating-<br>
> point', '', d)} \<br>
> --<br>
> 2.21.0<br>
> <br>
> --<br>
> _______________________________________________<br>
> Openembedded-core mailing list<br>
> <a href="mailto:Openembedded-core@lists.openembedded.org" target="_blank">Openembedded-core@lists.openembedded.org</a><br>
> <a href="http://lists.openembedded.org/mailman/listinfo/openembedded-core" rel="noreferrer" target="_blank">http://lists.openembedded.org/mailman/listinfo/openembedded-core</a><br>
-- <br>
_______________________________________________<br>
Openembedded-core mailing list<br>
<a href="mailto:Openembedded-core@lists.openembedded.org" target="_blank">Openembedded-core@lists.openembedded.org</a><br>
<a href="http://lists.openembedded.org/mailman/listinfo/openembedded-core" rel="noreferrer" target="_blank">http://lists.openembedded.org/mailman/listinfo/openembedded-core</a><br>
</blockquote></div>