* [master][zeus][PATCH] cairo: Adapt license for cairo-dbg and cairo-src based on contents @ 2019-12-05 22:26 Peter Kjellerstedt 2019-12-22 13:00 ` Peter Kjellerstedt 2020-01-10 15:23 ` Joshua Watt 0 siblings, 2 replies; 9+ messages in thread From: Peter Kjellerstedt @ 2019-12-05 22:26 UTC (permalink / raw) To: openembedded-core Introduce a PACKAGECONFIG "trace" to disable cairo-trace (the only part of the code licensed as GPL-3.0, and which is normally packaged separately in cairo-perf-utils). By disabling this, we can adapt the licenses for cairo-dbg and cairo-src so that they do not include "GPLv3+" when trace is disabled and thus they can be used also when, e.g., GPL-3.0 is blacklisted in INCOMPATIBLE_LICENSE. The "trace" PACKAGECONFIG is enabled by default for backwards compatibility. Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com> --- meta/recipes-graphics/cairo/cairo_1.16.0.bb | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/meta/recipes-graphics/cairo/cairo_1.16.0.bb b/meta/recipes-graphics/cairo/cairo_1.16.0.bb index e3de3f6164..36a7b3c180 100644 --- a/meta/recipes-graphics/cairo/cairo_1.16.0.bb +++ b/meta/recipes-graphics/cairo/cairo_1.16.0.bb @@ -17,6 +17,10 @@ LICENSE_${PN}-doc = "MPL-1.1 | LGPLv2.1" LICENSE_${PN}-gobject = "MPL-1.1 | LGPLv2.1" LICENSE_${PN}-script-interpreter = "MPL-1.1 | LGPLv2.1" LICENSE_${PN}-perf-utils = "GPLv3+" +# Adapt the licenses for cairo-dbg and cairo-src depending on whether +# cairo-trace is being built. +LICENSE_${PN}-dbg = "(MPL-1.1 | LGPLv2.1)${@bb.utils.contains('PACKAGECONFIG', 'trace', ' & GPLv3+', '', d)}" +LICENSE_${PN}-src = "(MPL-1.1 | LGPLv2.1)${@bb.utils.contains('PACKAGECONFIG', 'trace', ' & GPLv3+', '', d)}" LIC_FILES_CHKSUM = "file://COPYING;md5=e73e999e0c72b5ac9012424fa157ad77" @@ -40,7 +44,8 @@ X11DEPENDS = "virtual/libx11 libsm libxrender libxext" PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'directfb', d)} \ ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11 xcb', '', d)} \ - ${@bb.utils.contains('DISTRO_FEATURES', 'x11 opengl', 'opengl', '', d)}" + ${@bb.utils.contains('DISTRO_FEATURES', 'x11 opengl', 'opengl', '', d)} \ + trace" PACKAGECONFIG[x11] = "--with-x=yes -enable-xlib,--with-x=no --disable-xlib,${X11DEPENDS}" PACKAGECONFIG[xcb] = "--enable-xcb,--disable-xcb,libxcb" @@ -49,6 +54,7 @@ PACKAGECONFIG[valgrind] = "--enable-valgrind=yes,--disable-valgrind,valgrind" PACKAGECONFIG[egl] = "--enable-egl=yes,--disable-egl,virtual/egl" PACKAGECONFIG[glesv2] = "--enable-glesv2,--disable-glesv2,virtual/libgles2" PACKAGECONFIG[opengl] = "--enable-gl,--disable-gl,virtual/libgl" +PACKAGECONFIG[trace] = "--enable-trace,--disable-trace" EXTRA_OECONF += " \ ${@bb.utils.contains('TARGET_FPU', 'soft', '--disable-some-floating-point', '', d)} \ -- 2.21.0 ^ permalink raw reply related [flat|nested] 9+ messages in thread
* Re: [master][zeus][PATCH] cairo: Adapt license for cairo-dbg and cairo-src based on contents 2019-12-05 22:26 [master][zeus][PATCH] cairo: Adapt license for cairo-dbg and cairo-src based on contents Peter Kjellerstedt @ 2019-12-22 13:00 ` Peter Kjellerstedt 2019-12-22 13:21 ` Alexander Kanavin 2019-12-22 16:15 ` akuster808 2020-01-10 15:23 ` Joshua Watt 1 sibling, 2 replies; 9+ messages in thread From: Peter Kjellerstedt @ 2019-12-22 13:00 UTC (permalink / raw) To: openembedded-core *ping* //Peter > -----Original Message----- > From: openembedded-core-bounces@lists.openembedded.org <openembedded-core- > bounces@lists.openembedded.org> On Behalf Of Peter Kjellerstedt > Sent: den 5 december 2019 23:26 > To: openembedded-core@lists.openembedded.org > Subject: [OE-core] [master][zeus][PATCH] cairo: Adapt license for cairo- > dbg and cairo-src based on contents > > Introduce a PACKAGECONFIG "trace" to disable cairo-trace (the only > part of the code licensed as GPL-3.0, and which is normally packaged > separately in cairo-perf-utils). By disabling this, we can adapt the > licenses for cairo-dbg and cairo-src so that they do not include > "GPLv3+" when trace is disabled and thus they can be used also when, > e.g., GPL-3.0 is blacklisted in INCOMPATIBLE_LICENSE. > > The "trace" PACKAGECONFIG is enabled by default for backwards > compatibility. > > Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com> > --- > meta/recipes-graphics/cairo/cairo_1.16.0.bb | 8 +++++++- > 1 file changed, 7 insertions(+), 1 deletion(-) > > diff --git a/meta/recipes-graphics/cairo/cairo_1.16.0.bb b/meta/recipes- > graphics/cairo/cairo_1.16.0.bb > index e3de3f6164..36a7b3c180 100644 > --- a/meta/recipes-graphics/cairo/cairo_1.16.0.bb > +++ b/meta/recipes-graphics/cairo/cairo_1.16.0.bb > @@ -17,6 +17,10 @@ LICENSE_${PN}-doc = "MPL-1.1 | LGPLv2.1" > LICENSE_${PN}-gobject = "MPL-1.1 | LGPLv2.1" > LICENSE_${PN}-script-interpreter = "MPL-1.1 | LGPLv2.1" > LICENSE_${PN}-perf-utils = "GPLv3+" > +# Adapt the licenses for cairo-dbg and cairo-src depending on whether > +# cairo-trace is being built. > +LICENSE_${PN}-dbg = "(MPL-1.1 | > LGPLv2.1)${@bb.utils.contains('PACKAGECONFIG', 'trace', ' & GPLv3+', '', > d)}" > +LICENSE_${PN}-src = "(MPL-1.1 | > LGPLv2.1)${@bb.utils.contains('PACKAGECONFIG', 'trace', ' & GPLv3+', '', > d)}" > > LIC_FILES_CHKSUM = "file://COPYING;md5=e73e999e0c72b5ac9012424fa157ad77" > > @@ -40,7 +44,8 @@ X11DEPENDS = "virtual/libx11 libsm libxrender libxext" > > PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'directfb', d)} > \ > ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11 > xcb', '', d)} \ > - ${@bb.utils.contains('DISTRO_FEATURES', 'x11 opengl', > 'opengl', '', d)}" > + ${@bb.utils.contains('DISTRO_FEATURES', 'x11 opengl', > 'opengl', '', d)} \ > + trace" > > PACKAGECONFIG[x11] = "--with-x=yes -enable-xlib,--with-x=no --disable- > xlib,${X11DEPENDS}" > PACKAGECONFIG[xcb] = "--enable-xcb,--disable-xcb,libxcb" > @@ -49,6 +54,7 @@ PACKAGECONFIG[valgrind] = "--enable-valgrind=yes,-- > disable-valgrind,valgrind" > PACKAGECONFIG[egl] = "--enable-egl=yes,--disable-egl,virtual/egl" > PACKAGECONFIG[glesv2] = "--enable-glesv2,--disable- > glesv2,virtual/libgles2" > PACKAGECONFIG[opengl] = "--enable-gl,--disable-gl,virtual/libgl" > +PACKAGECONFIG[trace] = "--enable-trace,--disable-trace" > > EXTRA_OECONF += " \ > ${@bb.utils.contains('TARGET_FPU', 'soft', '--disable-some-floating- > point', '', d)} \ > -- > 2.21.0 > > -- > _______________________________________________ > Openembedded-core mailing list > Openembedded-core@lists.openembedded.org > http://lists.openembedded.org/mailman/listinfo/openembedded-core ^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [master][zeus][PATCH] cairo: Adapt license for cairo-dbg and cairo-src based on contents 2019-12-22 13:00 ` Peter Kjellerstedt @ 2019-12-22 13:21 ` Alexander Kanavin 2019-12-23 7:54 ` Peter Kjellerstedt 2019-12-22 16:15 ` akuster808 1 sibling, 1 reply; 9+ messages in thread From: Alexander Kanavin @ 2019-12-22 13:21 UTC (permalink / raw) To: Peter Kjellerstedt; +Cc: openembedded-core [-- Attachment #1: Type: text/plain, Size: 4152 bytes --] -dbg and -src packages are unlikely to be shipped to customers. How about either whitelisting them globally, or setting INCOMPABIBLE_LICENSE per image? 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. Alex On Sun, 22 Dec 2019 at 14:01, Peter Kjellerstedt < peter.kjellerstedt@axis.com> wrote: > *ping* > > //Peter > > > -----Original Message----- > > From: openembedded-core-bounces@lists.openembedded.org > <openembedded-core- > > bounces@lists.openembedded.org> On Behalf Of Peter Kjellerstedt > > Sent: den 5 december 2019 23:26 > > To: openembedded-core@lists.openembedded.org > > Subject: [OE-core] [master][zeus][PATCH] cairo: Adapt license for cairo- > > dbg and cairo-src based on contents > > > > Introduce a PACKAGECONFIG "trace" to disable cairo-trace (the only > > part of the code licensed as GPL-3.0, and which is normally packaged > > separately in cairo-perf-utils). By disabling this, we can adapt the > > licenses for cairo-dbg and cairo-src so that they do not include > > "GPLv3+" when trace is disabled and thus they can be used also when, > > e.g., GPL-3.0 is blacklisted in INCOMPATIBLE_LICENSE. > > > > The "trace" PACKAGECONFIG is enabled by default for backwards > > compatibility. > > > > Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com> > > --- > > meta/recipes-graphics/cairo/cairo_1.16.0.bb | 8 +++++++- > > 1 file changed, 7 insertions(+), 1 deletion(-) > > > > diff --git a/meta/recipes-graphics/cairo/cairo_1.16.0.bb b/meta/recipes- > > graphics/cairo/cairo_1.16.0.bb > > index e3de3f6164..36a7b3c180 100644 > > --- a/meta/recipes-graphics/cairo/cairo_1.16.0.bb > > +++ b/meta/recipes-graphics/cairo/cairo_1.16.0.bb > > @@ -17,6 +17,10 @@ LICENSE_${PN}-doc = "MPL-1.1 | LGPLv2.1" > > LICENSE_${PN}-gobject = "MPL-1.1 | LGPLv2.1" > > LICENSE_${PN}-script-interpreter = "MPL-1.1 | LGPLv2.1" > > LICENSE_${PN}-perf-utils = "GPLv3+" > > +# Adapt the licenses for cairo-dbg and cairo-src depending on whether > > +# cairo-trace is being built. > > +LICENSE_${PN}-dbg = "(MPL-1.1 | > > LGPLv2.1)${@bb.utils.contains('PACKAGECONFIG', 'trace', ' & GPLv3+', '', > > d)}" > > +LICENSE_${PN}-src = "(MPL-1.1 | > > LGPLv2.1)${@bb.utils.contains('PACKAGECONFIG', 'trace', ' & GPLv3+', '', > > d)}" > > > > LIC_FILES_CHKSUM = "file://COPYING;md5=e73e999e0c72b5ac9012424fa157ad77" > > > > @@ -40,7 +44,8 @@ X11DEPENDS = "virtual/libx11 libsm libxrender libxext" > > > > PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'directfb', d)} > > \ > > ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11 > > xcb', '', d)} \ > > - ${@bb.utils.contains('DISTRO_FEATURES', 'x11 opengl', > > 'opengl', '', d)}" > > + ${@bb.utils.contains('DISTRO_FEATURES', 'x11 opengl', > > 'opengl', '', d)} \ > > + trace" > > > > PACKAGECONFIG[x11] = "--with-x=yes -enable-xlib,--with-x=no --disable- > > xlib,${X11DEPENDS}" > > PACKAGECONFIG[xcb] = "--enable-xcb,--disable-xcb,libxcb" > > @@ -49,6 +54,7 @@ PACKAGECONFIG[valgrind] = "--enable-valgrind=yes,-- > > disable-valgrind,valgrind" > > PACKAGECONFIG[egl] = "--enable-egl=yes,--disable-egl,virtual/egl" > > PACKAGECONFIG[glesv2] = "--enable-glesv2,--disable- > > glesv2,virtual/libgles2" > > PACKAGECONFIG[opengl] = "--enable-gl,--disable-gl,virtual/libgl" > > +PACKAGECONFIG[trace] = "--enable-trace,--disable-trace" > > > > EXTRA_OECONF += " \ > > ${@bb.utils.contains('TARGET_FPU', 'soft', '--disable-some-floating- > > point', '', d)} \ > > -- > > 2.21.0 > > > > -- > > _______________________________________________ > > Openembedded-core mailing list > > Openembedded-core@lists.openembedded.org > > http://lists.openembedded.org/mailman/listinfo/openembedded-core > -- > _______________________________________________ > Openembedded-core mailing list > Openembedded-core@lists.openembedded.org > http://lists.openembedded.org/mailman/listinfo/openembedded-core > [-- Attachment #2: Type: text/html, Size: 6414 bytes --] ^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [master][zeus][PATCH] cairo: Adapt license for cairo-dbg and cairo-src based on contents 2019-12-22 13:21 ` Alexander Kanavin @ 2019-12-23 7:54 ` Peter Kjellerstedt 0 siblings, 0 replies; 9+ messages in thread From: Peter Kjellerstedt @ 2019-12-23 7:54 UTC (permalink / raw) To: Alexander Kanavin; +Cc: openembedded-core [-- Attachment #1: Type: text/plain, Size: 6176 bytes --] It is not possible to whitelist packages, WHITELIST_<license> only takes recipe names. This seems like a shortcoming, and doesn’t match INCOMPATIBLE_LICENSE, which works with packages… I am not sure how to address that shortcoming though, as it wouldn’t be right to allow mixing of recipes and packages in WHITELIST_<license>, which means a new variable would need to be introduced for whitelisting individual packages, and I do not know if it is worth the trouble. Setting INCOMPATIBLE_LICENSE per image is only available with master, so that is not yet an option (we’re currently at Warrior and won’t reach Dunfell till sometime this fall). That said, I do not have any strong feelings about this patch. The issue was raised by some of our developers, and we have a corresponding patch locally, so I thought I’d just pass it along. If there is no interest in in, then just drop it. //Peter From: Alexander Kanavin <alex.kanavin@gmail.com> Sent: den 22 december 2019 14:21 To: Peter Kjellerstedt <peter.kjellerstedt@axis.com> Cc: openembedded-core@lists.openembedded.org Subject: Re: [OE-core] [master][zeus][PATCH] cairo: Adapt license for cairo-dbg and cairo-src based on contents -dbg and -src packages are unlikely to be shipped to customers. How about either whitelisting them globally, or setting INCOMPABIBLE_LICENSE per image? 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. Alex On Sun, 22 Dec 2019 at 14:01, Peter Kjellerstedt <peter.kjellerstedt@axis.com<mailto:peter.kjellerstedt@axis.com>> wrote: *ping* //Peter > -----Original Message----- > From: openembedded-core-bounces@lists.openembedded.org<mailto:openembedded-core-bounces@lists.openembedded.org> <openembedded-core- > bounces@lists.openembedded.org<mailto:bounces@lists.openembedded.org>> On Behalf Of Peter Kjellerstedt > Sent: den 5 december 2019 23:26 > To: openembedded-core@lists.openembedded.org<mailto:openembedded-core@lists.openembedded.org> > Subject: [OE-core] [master][zeus][PATCH] cairo: Adapt license for cairo- > dbg and cairo-src based on contents > > Introduce a PACKAGECONFIG "trace" to disable cairo-trace (the only > part of the code licensed as GPL-3.0, and which is normally packaged > separately in cairo-perf-utils). By disabling this, we can adapt the > licenses for cairo-dbg and cairo-src so that they do not include > "GPLv3+" when trace is disabled and thus they can be used also when, > e.g., GPL-3.0 is blacklisted in INCOMPATIBLE_LICENSE. > > The "trace" PACKAGECONFIG is enabled by default for backwards > compatibility. > > Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com<mailto:peter.kjellerstedt@axis.com>> > --- > meta/recipes-graphics/cairo/cairo_1.16.0.bb<http://cairo_1.16.0.bb> | 8 +++++++- > 1 file changed, 7 insertions(+), 1 deletion(-) > > diff --git a/meta/recipes-graphics/cairo/cairo_1.16.0.bb<http://cairo_1.16.0.bb> b/meta/recipes- > graphics/cairo/cairo_1.16.0.bb<http://cairo_1.16.0.bb> > index e3de3f6164..36a7b3c180 100644 > --- a/meta/recipes-graphics/cairo/cairo_1.16.0.bb<http://cairo_1.16.0.bb> > +++ b/meta/recipes-graphics/cairo/cairo_1.16.0.bb<http://cairo_1.16.0.bb> > @@ -17,6 +17,10 @@ LICENSE_${PN}-doc = "MPL-1.1 | LGPLv2.1" > LICENSE_${PN}-gobject = "MPL-1.1 | LGPLv2.1" > LICENSE_${PN}-script-interpreter = "MPL-1.1 | LGPLv2.1" > LICENSE_${PN}-perf-utils = "GPLv3+" > +# Adapt the licenses for cairo-dbg and cairo-src depending on whether > +# cairo-trace is being built. > +LICENSE_${PN}-dbg = "(MPL-1.1 | > LGPLv2.1)${@bb.utils.contains('PACKAGECONFIG<mailto:$%7b@bb.utils.contains('PACKAGECONFIG>', 'trace', ' & GPLv3+', '', > d)}" > +LICENSE_${PN}-src = "(MPL-1.1 | > LGPLv2.1)${@bb.utils.contains('PACKAGECONFIG<mailto:$%7b@bb.utils.contains('PACKAGECONFIG>', 'trace', ' & GPLv3+', '', > d)}" > > LIC_FILES_CHKSUM = "file://COPYING;md5=e73e999e0c72b5ac9012424fa157ad77" > > @@ -40,7 +44,8 @@ X11DEPENDS = "virtual/libx11 libsm libxrender libxext" > > PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'directfb', d)} > \ > ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11 > xcb', '', d)} \ > - ${@bb.utils.contains('DISTRO_FEATURES', 'x11 opengl', > 'opengl', '', d)}<mailto:$%7b@bb.utils.filter('DISTRO_FEATURES',%20'directfb',%20d)%7d%0b%3e%20\%0b%3e %20 %20 %20 %20 %20 %20 %20 %20 %20 %20 $%7b@bb.utils.contains('DISTRO_FEATURES',%20'x11',%20'x11%0b%3e%20xcb',%20'',%20d)%7d%20\%0b%3e%20- %20 %20 %20 %20 %20 %20 %20 %20 %20 $%7b@bb.utils.contains('DISTRO_FEATURES',%20'x11%20opengl',%0b%3e%20'opengl',%20'',%20d)%7d>" > + ${@bb.utils.contains('DISTRO_FEATURES<mailto:$%7b@bb.utils.contains('DISTRO_FEATURES>', 'x11 opengl', > 'opengl', '', d)} \ > + trace" > > PACKAGECONFIG[x11] = "--with-x=yes -enable-xlib,--with-x=no --disable- > xlib,${X11DEPENDS}" > PACKAGECONFIG[xcb] = "--enable-xcb,--disable-xcb,libxcb" > @@ -49,6 +54,7 @@ PACKAGECONFIG[valgrind] = "--enable-valgrind=yes,-- > disable-valgrind,valgrind" > PACKAGECONFIG[egl] = "--enable-egl=yes,--disable-egl,virtual/egl" > PACKAGECONFIG[glesv2] = "--enable-glesv2,--disable- > glesv2,virtual/libgles2" > PACKAGECONFIG[opengl] = "--enable-gl,--disable-gl,virtual/libgl" > +PACKAGECONFIG[trace] = "--enable-trace,--disable-trace" > > EXTRA_OECONF += " \ > ${@bb.utils.contains('TARGET_FPU<mailto:$%7b@bb.utils.contains('TARGET_FPU>', 'soft', '--disable-some-floating- > point', '', d)} \ > -- > 2.21.0 > > -- > _______________________________________________ > Openembedded-core mailing list > Openembedded-core@lists.openembedded.org<mailto:Openembedded-core@lists.openembedded.org> > http://lists.openembedded.org/mailman/listinfo/openembedded-core -- _______________________________________________ Openembedded-core mailing list Openembedded-core@lists.openembedded.org<mailto:Openembedded-core@lists.openembedded.org> http://lists.openembedded.org/mailman/listinfo/openembedded-core [-- Attachment #2: Type: text/html, Size: 11914 bytes --] ^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [master][zeus][PATCH] cairo: Adapt license for cairo-dbg and cairo-src based on contents 2019-12-22 13:00 ` Peter Kjellerstedt 2019-12-22 13:21 ` Alexander Kanavin @ 2019-12-22 16:15 ` akuster808 2019-12-23 7:59 ` Peter Kjellerstedt 1 sibling, 1 reply; 9+ messages in thread From: akuster808 @ 2019-12-22 16:15 UTC (permalink / raw) To: Peter Kjellerstedt, openembedded-core On 12/22/19 5:00 AM, Peter Kjellerstedt wrote: > *ping* for master or zeus or both? - armin > > //Peter > >> -----Original Message----- >> From: openembedded-core-bounces@lists.openembedded.org <openembedded-core- >> bounces@lists.openembedded.org> On Behalf Of Peter Kjellerstedt >> Sent: den 5 december 2019 23:26 >> To: openembedded-core@lists.openembedded.org >> Subject: [OE-core] [master][zeus][PATCH] cairo: Adapt license for cairo- >> dbg and cairo-src based on contents >> >> Introduce a PACKAGECONFIG "trace" to disable cairo-trace (the only >> part of the code licensed as GPL-3.0, and which is normally packaged >> separately in cairo-perf-utils). By disabling this, we can adapt the >> licenses for cairo-dbg and cairo-src so that they do not include >> "GPLv3+" when trace is disabled and thus they can be used also when, >> e.g., GPL-3.0 is blacklisted in INCOMPATIBLE_LICENSE. >> >> The "trace" PACKAGECONFIG is enabled by default for backwards >> compatibility. >> >> Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com> >> --- >> meta/recipes-graphics/cairo/cairo_1.16.0.bb | 8 +++++++- >> 1 file changed, 7 insertions(+), 1 deletion(-) >> >> diff --git a/meta/recipes-graphics/cairo/cairo_1.16.0.bb b/meta/recipes- >> graphics/cairo/cairo_1.16.0.bb >> index e3de3f6164..36a7b3c180 100644 >> --- a/meta/recipes-graphics/cairo/cairo_1.16.0.bb >> +++ b/meta/recipes-graphics/cairo/cairo_1.16.0.bb >> @@ -17,6 +17,10 @@ LICENSE_${PN}-doc = "MPL-1.1 | LGPLv2.1" >> LICENSE_${PN}-gobject = "MPL-1.1 | LGPLv2.1" >> LICENSE_${PN}-script-interpreter = "MPL-1.1 | LGPLv2.1" >> LICENSE_${PN}-perf-utils = "GPLv3+" >> +# Adapt the licenses for cairo-dbg and cairo-src depending on whether >> +# cairo-trace is being built. >> +LICENSE_${PN}-dbg = "(MPL-1.1 | >> LGPLv2.1)${@bb.utils.contains('PACKAGECONFIG', 'trace', ' & GPLv3+', '', >> d)}" >> +LICENSE_${PN}-src = "(MPL-1.1 | >> LGPLv2.1)${@bb.utils.contains('PACKAGECONFIG', 'trace', ' & GPLv3+', '', >> d)}" >> >> LIC_FILES_CHKSUM = "file://COPYING;md5=e73e999e0c72b5ac9012424fa157ad77" >> >> @@ -40,7 +44,8 @@ X11DEPENDS = "virtual/libx11 libsm libxrender libxext" >> >> PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'directfb', d)} >> \ >> ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11 >> xcb', '', d)} \ >> - ${@bb.utils.contains('DISTRO_FEATURES', 'x11 opengl', >> 'opengl', '', d)}" >> + ${@bb.utils.contains('DISTRO_FEATURES', 'x11 opengl', >> 'opengl', '', d)} \ >> + trace" >> >> PACKAGECONFIG[x11] = "--with-x=yes -enable-xlib,--with-x=no --disable- >> xlib,${X11DEPENDS}" >> PACKAGECONFIG[xcb] = "--enable-xcb,--disable-xcb,libxcb" >> @@ -49,6 +54,7 @@ PACKAGECONFIG[valgrind] = "--enable-valgrind=yes,-- >> disable-valgrind,valgrind" >> PACKAGECONFIG[egl] = "--enable-egl=yes,--disable-egl,virtual/egl" >> PACKAGECONFIG[glesv2] = "--enable-glesv2,--disable- >> glesv2,virtual/libgles2" >> PACKAGECONFIG[opengl] = "--enable-gl,--disable-gl,virtual/libgl" >> +PACKAGECONFIG[trace] = "--enable-trace,--disable-trace" >> >> EXTRA_OECONF += " \ >> ${@bb.utils.contains('TARGET_FPU', 'soft', '--disable-some-floating- >> point', '', d)} \ >> -- >> 2.21.0 >> >> -- >> _______________________________________________ >> Openembedded-core mailing list >> Openembedded-core@lists.openembedded.org >> http://lists.openembedded.org/mailman/listinfo/openembedded-core ^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [master][zeus][PATCH] cairo: Adapt license for cairo-dbg and cairo-src based on contents 2019-12-22 16:15 ` akuster808 @ 2019-12-23 7:59 ` Peter Kjellerstedt 0 siblings, 0 replies; 9+ messages in thread From: Peter Kjellerstedt @ 2019-12-23 7:59 UTC (permalink / raw) To: akuster808, openembedded-core > -----Original Message----- > From: akuster808 <akuster808@gmail.com> > Sent: den 22 december 2019 17:16 > To: Peter Kjellerstedt <peter.kjellerstedt@axis.com>; openembedded- > core@lists.openembedded.org > Subject: Re: [OE-core] [master][zeus][PATCH] cairo: Adapt license for > cairo-dbg and cairo-src based on contents > > On 12/22/19 5:00 AM, Peter Kjellerstedt wrote: > > *ping* > > for master or zeus or both? Well, first hand for master, as I expected Zeus would follow if it was accepted there. However, see separate mails from Alexander and me regarding its acceptance for master. > - armin > > > //Peter //Peter > >> -----Original Message----- > >> From: openembedded-core-bounces@lists.openembedded.org <openembedded- > core- > >> bounces@lists.openembedded.org> On Behalf Of Peter Kjellerstedt > >> Sent: den 5 december 2019 23:26 > >> To: openembedded-core@lists.openembedded.org > >> Subject: [OE-core] [master][zeus][PATCH] cairo: Adapt license for > cairo- > >> dbg and cairo-src based on contents > >> > >> Introduce a PACKAGECONFIG "trace" to disable cairo-trace (the only > >> part of the code licensed as GPL-3.0, and which is normally packaged > >> separately in cairo-perf-utils). By disabling this, we can adapt the > >> licenses for cairo-dbg and cairo-src so that they do not include > >> "GPLv3+" when trace is disabled and thus they can be used also when, > >> e.g., GPL-3.0 is blacklisted in INCOMPATIBLE_LICENSE. > >> > >> The "trace" PACKAGECONFIG is enabled by default for backwards > >> compatibility. > >> > >> Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com> > >> --- > >> meta/recipes-graphics/cairo/cairo_1.16.0.bb | 8 +++++++- > >> 1 file changed, 7 insertions(+), 1 deletion(-) > >> > >> diff --git a/meta/recipes-graphics/cairo/cairo_1.16.0.bb > b/meta/recipes- > >> graphics/cairo/cairo_1.16.0.bb > >> index e3de3f6164..36a7b3c180 100644 > >> --- a/meta/recipes-graphics/cairo/cairo_1.16.0.bb > >> +++ b/meta/recipes-graphics/cairo/cairo_1.16.0.bb > >> @@ -17,6 +17,10 @@ LICENSE_${PN}-doc = "MPL-1.1 | LGPLv2.1" > >> LICENSE_${PN}-gobject = "MPL-1.1 | LGPLv2.1" > >> LICENSE_${PN}-script-interpreter = "MPL-1.1 | LGPLv2.1" > >> LICENSE_${PN}-perf-utils = "GPLv3+" > >> +# Adapt the licenses for cairo-dbg and cairo-src depending on whether > >> +# cairo-trace is being built. > >> +LICENSE_${PN}-dbg = "(MPL-1.1 | > >> LGPLv2.1)${@bb.utils.contains('PACKAGECONFIG', 'trace', ' & GPLv3+', > '', > >> d)}" > >> +LICENSE_${PN}-src = "(MPL-1.1 | > >> LGPLv2.1)${@bb.utils.contains('PACKAGECONFIG', 'trace', ' & GPLv3+', > '', > >> d)}" > >> > >> LIC_FILES_CHKSUM = > "file://COPYING;md5=e73e999e0c72b5ac9012424fa157ad77" > >> > >> @@ -40,7 +44,8 @@ X11DEPENDS = "virtual/libx11 libsm libxrender > libxext" > >> > >> PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'directfb', > d)} > >> \ > >> ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11 > >> xcb', '', d)} \ > >> - ${@bb.utils.contains('DISTRO_FEATURES', 'x11 > opengl', > >> 'opengl', '', d)}" > >> + ${@bb.utils.contains('DISTRO_FEATURES', 'x11 > opengl', > >> 'opengl', '', d)} \ > >> + trace" > >> > >> PACKAGECONFIG[x11] = "--with-x=yes -enable-xlib,--with-x=no --disable- > >> xlib,${X11DEPENDS}" > >> PACKAGECONFIG[xcb] = "--enable-xcb,--disable-xcb,libxcb" > >> @@ -49,6 +54,7 @@ PACKAGECONFIG[valgrind] = "--enable-valgrind=yes,-- > >> disable-valgrind,valgrind" > >> PACKAGECONFIG[egl] = "--enable-egl=yes,--disable-egl,virtual/egl" > >> PACKAGECONFIG[glesv2] = "--enable-glesv2,--disable- > >> glesv2,virtual/libgles2" > >> PACKAGECONFIG[opengl] = "--enable-gl,--disable-gl,virtual/libgl" > >> +PACKAGECONFIG[trace] = "--enable-trace,--disable-trace" > >> > >> EXTRA_OECONF += " \ > >> ${@bb.utils.contains('TARGET_FPU', 'soft', '--disable-some- > floating- > >> point', '', d)} \ > >> -- > >> 2.21.0 > >> > >> -- > >> _______________________________________________ > >> Openembedded-core mailing list > >> Openembedded-core@lists.openembedded.org > >> http://lists.openembedded.org/mailman/listinfo/openembedded-core ^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [master][zeus][PATCH] cairo: Adapt license for cairo-dbg and cairo-src based on contents 2019-12-05 22:26 [master][zeus][PATCH] cairo: Adapt license for cairo-dbg and cairo-src based on contents Peter Kjellerstedt 2019-12-22 13:00 ` Peter Kjellerstedt @ 2020-01-10 15:23 ` Joshua Watt 2020-01-10 21:58 ` Peter Kjellerstedt 1 sibling, 1 reply; 9+ messages in thread From: Joshua Watt @ 2020-01-10 15:23 UTC (permalink / raw) To: Peter Kjellerstedt, openembedded-core On 12/5/19 4:26 PM, Peter Kjellerstedt wrote: > Introduce a PACKAGECONFIG "trace" to disable cairo-trace (the only > part of the code licensed as GPL-3.0, and which is normally packaged > separately in cairo-perf-utils). By disabling this, we can adapt the > licenses for cairo-dbg and cairo-src so that they do not include > "GPLv3+" when trace is disabled and thus they can be used also when, > e.g., GPL-3.0 is blacklisted in INCOMPATIBLE_LICENSE. Thanks for this, it fixes a build error I was experiencing. However, when I apply this patch locally for testing, I get QA errors saying that the "/usr/bin" and "/usr/lib/cairo" directories aren't part of any package. It looks like these directories are empty when trace is disabled and should be removed in do_install ? > > The "trace" PACKAGECONFIG is enabled by default for backwards > compatibility. > > Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com> > --- > meta/recipes-graphics/cairo/cairo_1.16.0.bb | 8 +++++++- > 1 file changed, 7 insertions(+), 1 deletion(-) > > diff --git a/meta/recipes-graphics/cairo/cairo_1.16.0.bb b/meta/recipes-graphics/cairo/cairo_1.16.0.bb > index e3de3f6164..36a7b3c180 100644 > --- a/meta/recipes-graphics/cairo/cairo_1.16.0.bb > +++ b/meta/recipes-graphics/cairo/cairo_1.16.0.bb > @@ -17,6 +17,10 @@ LICENSE_${PN}-doc = "MPL-1.1 | LGPLv2.1" > LICENSE_${PN}-gobject = "MPL-1.1 | LGPLv2.1" > LICENSE_${PN}-script-interpreter = "MPL-1.1 | LGPLv2.1" > LICENSE_${PN}-perf-utils = "GPLv3+" > +# Adapt the licenses for cairo-dbg and cairo-src depending on whether > +# cairo-trace is being built. > +LICENSE_${PN}-dbg = "(MPL-1.1 | LGPLv2.1)${@bb.utils.contains('PACKAGECONFIG', 'trace', ' & GPLv3+', '', d)}" > +LICENSE_${PN}-src = "(MPL-1.1 | LGPLv2.1)${@bb.utils.contains('PACKAGECONFIG', 'trace', ' & GPLv3+', '', d)}" > > LIC_FILES_CHKSUM = "file://COPYING;md5=e73e999e0c72b5ac9012424fa157ad77" > > @@ -40,7 +44,8 @@ X11DEPENDS = "virtual/libx11 libsm libxrender libxext" > > PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'directfb', d)} \ > ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11 xcb', '', d)} \ > - ${@bb.utils.contains('DISTRO_FEATURES', 'x11 opengl', 'opengl', '', d)}" > + ${@bb.utils.contains('DISTRO_FEATURES', 'x11 opengl', 'opengl', '', d)} \ > + trace" > > PACKAGECONFIG[x11] = "--with-x=yes -enable-xlib,--with-x=no --disable-xlib,${X11DEPENDS}" > PACKAGECONFIG[xcb] = "--enable-xcb,--disable-xcb,libxcb" > @@ -49,6 +54,7 @@ PACKAGECONFIG[valgrind] = "--enable-valgrind=yes,--disable-valgrind,valgrind" > PACKAGECONFIG[egl] = "--enable-egl=yes,--disable-egl,virtual/egl" > PACKAGECONFIG[glesv2] = "--enable-glesv2,--disable-glesv2,virtual/libgles2" > PACKAGECONFIG[opengl] = "--enable-gl,--disable-gl,virtual/libgl" > +PACKAGECONFIG[trace] = "--enable-trace,--disable-trace" > > EXTRA_OECONF += " \ > ${@bb.utils.contains('TARGET_FPU', 'soft', '--disable-some-floating-point', '', d)} \ ^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [master][zeus][PATCH] cairo: Adapt license for cairo-dbg and cairo-src based on contents 2020-01-10 15:23 ` Joshua Watt @ 2020-01-10 21:58 ` Peter Kjellerstedt 2020-01-10 22:02 ` Joshua Watt 0 siblings, 1 reply; 9+ messages in thread From: Peter Kjellerstedt @ 2020-01-10 21:58 UTC (permalink / raw) To: Joshua Watt, openembedded-core > -----Original Message----- > From: Joshua Watt <jpewhacker@gmail.com> > Sent: den 10 januari 2020 16:23 > To: Peter Kjellerstedt <peter.kjellerstedt@axis.com>; openembedded- > core@lists.openembedded.org > Subject: Re: [OE-core] [master][zeus][PATCH] cairo: Adapt license for > cairo-dbg and cairo-src based on contents > > On 12/5/19 4:26 PM, Peter Kjellerstedt wrote: > > Introduce a PACKAGECONFIG "trace" to disable cairo-trace (the only > > part of the code licensed as GPL-3.0, and which is normally packaged > > separately in cairo-perf-utils). By disabling this, we can adapt the > > licenses for cairo-dbg and cairo-src so that they do not include > > "GPLv3+" when trace is disabled and thus they can be used also when, > > e.g., GPL-3.0 is blacklisted in INCOMPATIBLE_LICENSE. > > Thanks for this, it fixes a build error I was experiencing. However, Out of curiosity, how can it fix a build failure? > when I apply this patch locally for testing, I get QA errors saying that > the "/usr/bin" and "/usr/lib/cairo" directories aren't part of any > package. It looks like these directories are empty when trace is > disabled and should be removed in do_install ? Ok, that's embarrassing. Apparently I had --disable-script in EXTRA_OECONF (from a local bbappend we have) when I tested without "trace" in PACKAGECONFIG, and apparently that causes cairo-sphinx not to be built and thus the /usr/bin and /usr/lib/cairo directories are never created. I'll send an updated patch. //Peter ^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [master][zeus][PATCH] cairo: Adapt license for cairo-dbg and cairo-src based on contents 2020-01-10 21:58 ` Peter Kjellerstedt @ 2020-01-10 22:02 ` Joshua Watt 0 siblings, 0 replies; 9+ messages in thread From: Joshua Watt @ 2020-01-10 22:02 UTC (permalink / raw) To: Peter Kjellerstedt, openembedded-core On 1/10/20 3:58 PM, Peter Kjellerstedt wrote: >> -----Original Message----- >> From: Joshua Watt <jpewhacker@gmail.com> >> Sent: den 10 januari 2020 16:23 >> To: Peter Kjellerstedt <peter.kjellerstedt@axis.com>; openembedded- >> core@lists.openembedded.org >> Subject: Re: [OE-core] [master][zeus][PATCH] cairo: Adapt license for >> cairo-dbg and cairo-src based on contents >> >> On 12/5/19 4:26 PM, Peter Kjellerstedt wrote: >>> Introduce a PACKAGECONFIG "trace" to disable cairo-trace (the only >>> part of the code licensed as GPL-3.0, and which is normally packaged >>> separately in cairo-perf-utils). By disabling this, we can adapt the >>> licenses for cairo-dbg and cairo-src so that they do not include >>> "GPLv3+" when trace is disabled and thus they can be used also when, >>> e.g., GPL-3.0 is blacklisted in INCOMPATIBLE_LICENSE. >> Thanks for this, it fixes a build error I was experiencing. However, > Out of curiosity, how can it fix a build failure? As you pointed out in the commit message, it allows image construction when INCOMPATIBLE_LICENSE contains "GPL-3.0" :) > >> when I apply this patch locally for testing, I get QA errors saying that >> the "/usr/bin" and "/usr/lib/cairo" directories aren't part of any >> package. It looks like these directories are empty when trace is >> disabled and should be removed in do_install ? > Ok, that's embarrassing. Apparently I had --disable-script in > EXTRA_OECONF (from a local bbappend we have) when I tested without > "trace" in PACKAGECONFIG, and apparently that causes cairo-sphinx > not to be built and thus the /usr/bin and /usr/lib/cairo directories > are never created. > > I'll send an updated patch. > > //Peter > ^ permalink raw reply [flat|nested] 9+ messages in thread
end of thread, other threads:[~2020-01-10 22:02 UTC | newest] Thread overview: 9+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2019-12-05 22:26 [master][zeus][PATCH] cairo: Adapt license for cairo-dbg and cairo-src based on contents Peter Kjellerstedt 2019-12-22 13:00 ` Peter Kjellerstedt 2019-12-22 13:21 ` Alexander Kanavin 2019-12-23 7:54 ` Peter Kjellerstedt 2019-12-22 16:15 ` akuster808 2019-12-23 7:59 ` Peter Kjellerstedt 2020-01-10 15:23 ` Joshua Watt 2020-01-10 21:58 ` Peter Kjellerstedt 2020-01-10 22:02 ` Joshua Watt
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.