On Thu, Sep 8, 2022 at 6:44 AM Peter Kjellerstedt <[email protected]> wrote: > > Please cherry-pick this to Kirkstone.
Will do! Steve > > //Peter > > > -----Original Message----- > > From: [email protected] > > <[email protected]> On Behalf Of Peter Kjellerstedt > > Sent: den 6 september 2022 15:34 > > To: [email protected] > > Subject: [OE-core] [PATCH] cairo: Adapt the license information based on > > what is being built > > > > If the "trace" PACKAGECONFIG is removed to disable cairo-trace (the > > only part of the code licensed as GPL-3.0), we can adapt the licenses > > for cairo-dbg and cairo-src so that they do not include > > "GPL-3.0-or-later" and thus they can be used also when, e.g., GPL-3.0 > > is blacklisted in INCOMPATIBLE_LICENSE. Also drop the GPL-3.0 license > > text from LIC_FILES_CHKSUM in this case. > > > > Signed-off-by: Peter Kjellerstedt <[email protected]> > > --- > > > > This applies the suggestion from commit f763b906 (cairo: Add missing > > GPLv3 license checksum entry). I have verified that when disabling the > > trace PACKAGECONFIG, then there is no trace (no pun intended) of the > > GPL-3.0 code in the -dbg and -src packages. > > > > meta/recipes-graphics/cairo/cairo_1.16.0.bb | 6 +++++- > > 1 file changed, 5 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 67081bb8cb..ffb813d290 100644 > > --- a/meta/recipes-graphics/cairo/cairo_1.16.0.bb > > +++ b/meta/recipes-graphics/cairo/cairo_1.16.0.bb > > @@ -17,9 +17,13 @@ LICENSE:${PN}-doc = "MPL-1.1 | LGPL-2.1-only" > > LICENSE:${PN}-gobject = "MPL-1.1 | LGPL-2.1-only" > > LICENSE:${PN}-script-interpreter = "MPL-1.1 | LGPL-2.1-only" > > LICENSE:${PN}-perf-utils = "GPL-3.0-or-later" > > +# Adapt the licenses for cairo-dbg and cairo-src depending on whether > > +# cairo-trace is being built. > > +LICENSE:${PN}-dbg = "(MPL-1.1 | > > LGPL-2.1-only)${@bb.utils.contains('PACKAGECONFIG', 'trace', ' & > > GPL-3.0-or-later', '', d)}" > > +LICENSE:${PN}-src = "(MPL-1.1 | > > LGPL-2.1-only)${@bb.utils.contains('PACKAGECONFIG', 'trace', ' & > > GPL-3.0-or-later', '', d)}" > > > > LIC_FILES_CHKSUM = "file://COPYING;md5=e73e999e0c72b5ac9012424fa157ad77 \ > > - > > file://util/cairo-trace/COPYING-GPL-3;md5=d32239bcb673463ab874e80d47fae504" > > + ${@bb.utils.contains('PACKAGECONFIG', 'trace', > > 'file://util/cairo-trace/COPYING-GPL-3;md5=d32239bcb673463ab874e80d47fae504', > > '', d)}" > > > > > > DEPENDS = "fontconfig glib-2.0 libpng pixman zlib"
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#170472): https://lists.openembedded.org/g/openembedded-core/message/170472 Mute This Topic: https://lists.openembedded.org/mt/93500619/21656 Group Owner: [email protected] Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
