cairo: Adapt license for cairo-dbg and cairo-src based on contents
PATCH 1/1 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.
--- meta/recipes-graphics/cairo/cairo_1.16.0.bb | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-)
meta/recipes-graphics/cairo/cairo_1.16.0.bb +7 -1
@@ -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)} \
Signature · 1 line
2.21.0
*ping*
//Peter
Quoted 77 lines
-----Original Message-----
From: [email protected] <openembedded-core- [email protected]> On Behalf Of Peter Kjellerstedt
Sent: den 5 december 2019 23:26
To: [email protected]
Subject: [OE-core] [master][zeus][PATCH] cairo: Adapt license for cairo- dbg and cairo-src based on contentsIntroduce 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 <[email protected]>--- meta/recipes-graphics/cairo/cairo_1.16.0.bb | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-)meta/recipes- renamed from meta/recipes-graphics/cairo/cairo_1.16.0.bb +0
-0graphics/cairo/cairo_1.16.0.bb
indexe3de3f6164..36a7b3c180100644meta/recipes-graphics/cairo/cairo_1.16.0.bb +3
-0@@ -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"meta/recipes-graphics/cairo/cairo_1.16.0.bb +0
-1@@ -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"meta/recipes-graphics/cairo/cairo_1.16.0.bb +0
-0@@ -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
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-core
-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
Quoted 88 lines · Peter Kjellerstedt
*ping*
//Peter
Quoted 2 lines
-----Original Message-----
From: [email protected]<openembedded-core-
Quoted 70 lines
[email protected]> On Behalf Of Peter Kjellerstedt
Sent: den 5 december 2019 23:26
To: [email protected]
Subject: [OE-core] [master][zeus][PATCH] cairo: Adapt license for cairo- dbg and cairo-src based on contentsIntroduce 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 <[email protected]>--- meta/recipes-graphics/cairo/cairo_1.16.0.bb | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-)meta/recipes- renamed from meta/recipes-graphics/cairo/cairo_1.16.0.bb +0
-0graphics/cairo/cairo_1.16.0.bb
indexe3de3f6164..36a7b3c180100644meta/recipes-graphics/cairo/cairo_1.16.0.bb +3
-0@@ -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"meta/recipes-graphics/cairo/cairo_1.16.0.bb +0
-1@@ -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"meta/recipes-graphics/cairo/cairo_1.16.0.bb +0
-0@@ -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.0Quoted 5 lines
--
_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-core--
_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-core
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 <[email protected]>
Sent: den 22 december 2019 14:21
To: Peter Kjellerstedt <[email protected]>
Cc: [email protected]
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 <[email protected]<mailto:[email protected]>> wrote:
*ping*
//Peter
Quoted 72 lines
-----Original Message-----
From: [email protected]<mailto:[email protected]> <openembedded-core- [email protected]<mailto:[email protected]>> On Behalf Of Peter Kjellerstedt
Sent: den 5 december 2019 23:26
To: [email protected]<mailto:[email protected]>
Subject: [OE-core] [master][zeus][PATCH] cairo: Adapt license for cairo-
dbg and cairo-src based on contentsIntroduce 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.
--- meta/recipes-graphics/cairo/cairo_1.16.0.bb<http://cairo_1.16.0.bb> | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-)meta/recipes- renamed from meta/recipes-graphics/cairo/cairo_1.16.0.bb<http://cairo_1.16.0.bb> +0
-0graphics/cairo/cairo_1.16.0.bb<http://cairo_1.16.0.bb> index
e3de3f6164..36a7b3c180100644meta/recipes-graphics/cairo/cairo_1.16.0.bb<http://cairo_1.16.0.bb> +3
-0@@ -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:$%[email protected]('PACKAGECONFIG>', 'trace', ' & GPLv3+', '',d)}"
+LICENSE_${PN}-src = "(MPL-1.1 | LGPLv2.1)${@bb.utils.contains('PACKAGECONFIG<mailto:$%[email protected]('PACKAGECONFIG>', 'trace', ' & GPLv3+', '', d)}"
LIC_FILES_CHKSUM= "file://COPYING;md5=e73e999e0c72b5ac9012424fa157ad77"meta/recipes-graphics/cairo/cairo_1.16.0.bb<http://cairo_1.16.0.bb> +0
-1@@ -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:$%[email protected]('DISTRO_FEATURES',%20'directfb',%20d)%7d%0b%3e%20\%0b%3e %20 %20 %20 %20 %20 %20 %20 %20 %20 %20 $%[email protected]('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 $%[email protected]('DISTRO_FEATURES',%20'x11%20opengl',%0b%3e%20'opengl',%20'',%20d)%7d>"
+ ${@bb.utils.contains('DISTRO_FEATURES<mailto:$%[email protected]('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"meta/recipes-graphics/cairo/cairo_1.16.0.bb<http://cairo_1.16.0.bb> +0
-0@@ -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:$%[email protected]('TARGET_FPU>', 'soft', '--disable-some-floating-point', '', d)} \
--
2.21.0
Quoted 5 lines
--
_______________________________________________
Openembedded-core mailing list [email protected]<mailto:[email protected]>
http://lists.openembedded.org/mailman/listinfo/openembedded-core
--
_______________________________________________
Openembedded-core mailing list [email protected]<mailto:[email protected]>
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Quoted 1 line · Peter Kjellerstedt
*ping*
for master or zeus or both?
- armin
Quoted 80 lines
//Peter
Quoted 77 lines
-----Original Message-----
From: [email protected] <openembedded-core- [email protected]> On Behalf Of Peter Kjellerstedt
Sent: den 5 december 2019 23:26
To: [email protected]
Subject: [OE-core] [master][zeus][PATCH] cairo: Adapt license for cairo- dbg and cairo-src based on contentsIntroduce 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 <[email protected]>--- meta/recipes-graphics/cairo/cairo_1.16.0.bb | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-)meta/recipes- renamed from meta/recipes-graphics/cairo/cairo_1.16.0.bb +0
-0graphics/cairo/cairo_1.16.0.bb
indexe3de3f6164..36a7b3c180100644meta/recipes-graphics/cairo/cairo_1.16.0.bb +3
-0@@ -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"meta/recipes-graphics/cairo/cairo_1.16.0.bb +0
-1@@ -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"meta/recipes-graphics/cairo/cairo_1.16.0.bb +0
-0@@ -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
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Quoted 8 lines
-----Original Message-----
From: akuster808 <[email protected]>
Sent: den 22 december 2019 17:16
To: Peter Kjellerstedt <[email protected]>; openembedded- [email protected]
Subject: Re: [OE-core] [master][zeus][PATCH] cairo: Adapt license for cairo-dbg and cairo-src based on contents
Quoted 4 lines
Quoted 1 line · Peter Kjellerstedt
*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.
Quoted 3 lines
- armin
Quoted 1 line
//Peter
//Peter
Quoted 88 lines
Quoted 2 lines
Quoted 2 lines
-----Original Message-----
From: [email protected] <openembedded-core-
Quoted 4 lines
Quoted 4 lines
[email protected]> On Behalf Of Peter Kjellerstedt
Sent: den 5 december 2019 23:26
To: [email protected]
Subject: [OE-core] [master][zeus][PATCH] cairo: Adapt license forcairo-
Quoted 12 lines
Quoted 12 lines
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.
Quoted 6 lines
Review
Quoted 6 lines
Signed-off-by Peter Kjellerstedt <[email protected]>--- meta/recipes-graphics/cairo/cairo_1.16.0.bb | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-)(quoted diff) +0
-0b/meta/recipes-
Quoted 4 lines
Quoted 4 lines
graphics/cairo/cairo_1.16.0.bb
indexe3de3f6164..36a7b3c180100644meta/recipes-graphics/cairo/cairo_1.16.0.bb +0
-0Quoted 8 lines
meta/recipes-graphics/cairo/cairo_1.16.0.bb LICENSE_${PN}-doc = "MPL-1.1 | LGPLv2.1" · line 23
Quoted 8 lines
meta/recipes-graphics/cairo/cairo_1.16.0.bb +3
-0@@ -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+','',
Quoted 3 lines
Quoted 3 lines
d)}"
+LICENSE_${PN}-src = "(MPL-1.1 | LGPLv2.1)${@bb.utils.contains('PACKAGECONFIG', 'trace', ' & GPLv3+','',
Quoted 3 lines
Quoted 3 lines
d)}"
LIC_FILES_CHKSUM="file://COPYING;md5=e73e999e0c72b5ac9012424fa157ad77"
Quoted 2 lines
meta/recipes-graphics/cairo/cairo_1.16.0.bb X11DEPENDS = "virtual/libx11 libsm libxrender
Quoted 2 lines
meta/recipes-graphics/cairo/cairo_1.16.0.bb +0
-0@@ -40,7 +44,8 @@ X11DEPENDS = "virtual/libx11 libsm libxrenderlibxext"
Quoted 2 lines
meta/recipes-graphics/cairo/cairo_1.16.0.bb X11DEPENDS = "virtual/libx11 libsm libxrender · line 44
Quoted 2 lines
meta/recipes-graphics/cairo/cairo_1.16.0.bb +0
-0PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'directfb',d)}
Quoted 4 lines
meta/recipes-graphics/cairo/cairo_1.16.0.bb X11DEPENDS = "virtual/libx11 libsm libxrender · line 44
Quoted 4 lines
meta/recipes-graphics/cairo/cairo_1.16.0.bb +0
-1\ ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11 xcb', '', d)} \ - ${@bb.utils.contains('DISTRO_FEATURES', 'x11opengl',
Quoted 2 lines
Quoted 2 lines
'opengl', '', d)}"
+ ${@bb.utils.contains('DISTRO_FEATURES', 'x11opengl',
Quoted 14 lines
Quoted 14 lines
'opengl', '', d)} \
+ trace"PACKAGECONFIG[x11] = "--with-x=yes -enable-xlib,--with-x=no --disable-
xlib,${X11DEPENDS}"
PACKAGECONFIG[xcb] = "--enable-xcb,--disable-xcb,libxcb"meta/recipes-graphics/cairo/cairo_1.16.0.bb +0
-0@@ -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"Quoted 2 lines
Quoted 2 lines
EXTRA_OECONF += " \ ${@bb.utils.contains('TARGET_FPU', 'soft', '--disable-some-floating-
Quoted 9 lines
Quoted 9 lines
point', '', d)} \
--
2.21.0--
_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Quoted 6 lines · Peter Kjellerstedt
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 ?
Quoted 42 lines
The "trace" PACKAGECONFIG is enabled by default for backwards compatibility.
Signed-off-by Peter Kjellerstedt <[email protected]>--- meta/recipes-graphics/cairo/cairo_1.16.0.bb | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-)meta/recipes-graphics/cairo/cairo_1.16.0.bb +7
-1@@ -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)} \
Quoted 9 lines
-----Original Message-----
From: Joshua Watt <[email protected]>
Sent: den 10 januari 2020 16:23
To: Peter Kjellerstedt <[email protected]>; openembedded- [email protected]
Subject: Re: [OE-core] [master][zeus][PATCH] cairo: Adapt license for cairo-dbg and cairo-src based on contentsOn 12/5/19 4:26 PM, Peter Kjellerstedt wrote:
Quoted 8 lines
Quoted 6 lines
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?
Quoted 4 lines
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 indo_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
Quoted 9 lines · Peter Kjellerstedt
Quoted 9 lines
-----Original Message-----
From: Joshua Watt <[email protected]>
Sent: den 10 januari 2020 16:23
To: Peter Kjellerstedt <[email protected]>; openembedded- [email protected]
Subject: Re: [OE-core] [master][zeus][PATCH] cairo: Adapt license for cairo-dbg and cairo-src based on contentsOn 12/5/19 4:26 PM, Peter Kjellerstedt wrote:
Quoted 8 lines
Quoted 7 lines
Quoted 6 lines
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" :)
Quoted 15 lines
Quoted 5 lines
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 indo_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/binand/usr/lib/cairodirectories are never created.I'll send an updated patch.
//Peter