Skip to contentSkip to conversation

cairo: Adapt the license information based on what is being built

PATCH Peter Kjellerstedt 2 participants 2 messages Sep 8, 2022 1 message not in the archive

lore
Share & tools
lore

A message that is not in the archive (sent off-list or not yet received): [email protected]

#1 lore raw

Please cherry-pick this to Kirkstone.

//Peter

Quoted 43 lines

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

---

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(-)
meta/recipes-graphics/cairo/cairo_1.16.0.bb +5 -1
index 67081bb8cb..ffb813d290 100644
@@ -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"
#2 lore raw
Quoted 2 lines · Peter Kjellerstedt

Please cherry-pick this to Kirkstone.

Will do!

Steve

Quoted 46 lines

//Peter

Quoted 43 lines

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

---

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(-)
meta/recipes-graphics/cairo/cairo_1.16.0.bb +5 -1
index 67081bb8cb..ffb813d290 100644
@@ -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"