cairo: use ${PN} in package name
PATCH 1/1 cairo: use ${PN} in package name
From: Steven Walter <[email protected]>
Without this, bitbake complains that the license for cairo-gobject is incorrect, because the license is set using ${PN}
--- meta/recipes-graphics/cairo/cairo_1.16.0.bb | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)
meta/recipes-graphics/cairo/cairo_1.16.0.bb +6 -6
@@ -77,17 +77,17 @@ do_install:append () { rmdir -p --ignore-fail-on-non-empty ${D}${libdir}/cairo } -PACKAGES =+ "cairo-gobject cairo-script-interpreter cairo-perf-utils" +PACKAGES =+ "${PN}-gobject ${PN}-script-interpreter ${PN}-perf-utils" -SUMMARY:cairo-gobject = "The Cairo library GObject wrapper library" -DESCRIPTION:cairo-gobject = "A GObject wrapper library for the Cairo API." +SUMMARY:${PN}-gobject = "The Cairo library GObject wrapper library" +DESCRIPTION:${PN}-gobject = "A GObject wrapper library for the Cairo API." -SUMMARY:cairo-script-interpreter = "The Cairo library script interpreter" -DESCRIPTION:cairo-script-interpreter = "The Cairo script interpreter implements \ +SUMMARY:${PN}-script-interpreter = "The Cairo library script interpreter" +DESCRIPTION:${PN}-script-interpreter = "The Cairo script interpreter implements \ CairoScript. CairoScript is used by tracing utilities to enable the ability \ to replay rendering." -DESCRIPTION:cairo-perf-utils = "The Cairo library performance utilities" +DESCRIPTION:${PN}-perf-utils = "The Cairo library performance utilities" FILES:${PN} = "${libdir}/libcairo.so.*" FILES:${PN}-gobject = "${libdir}/libcairo-gobject.so.*"
Signature · 1 line
2.25.1
Quoted 28 lines · On Wed, 2021-10-06 at 10:36 -0400, [email protected] wrote:
From: Steven Walter <[email protected]>
Without this, bitbake complains that the license for cairo-gobject is incorrect, because the license is set using ${PN}
Signed-off-by Kyle Russell <[email protected]>--- meta/recipes-graphics/cairo/cairo_1.16.0.bb | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)meta/recipes-graphics/cairo/cairo_1.16.0.bb +3
-5@@ -77,17 +77,17 @@ do_install:append () { rmdir -p --ignore-fail-on-non-empty ${D}${libdir}/cairo } -PACKAGES =+ "cairo-gobject cairo-script-interpreter cairo-perf-utils" +PACKAGES =+ "${PN}-gobject ${PN}-script-interpreter ${PN}-perf-utils" -SUMMARY:cairo-gobject = "The Cairo library GObject wrapper library" -DESCRIPTION:cairo-gobject = "A GObject wrapper library for the Cairo API." +SUMMARY:${PN}-gobject = "The Cairo library GObject wrapper library" +DESCRIPTION:${PN}-gobject = "A GObject wrapper library for the Cairo API." -SUMMARY:cairo-script-interpreter = "The Cairo library script interpreter" -DESCRIPTION:cairo-script-interpreter = "The Cairo script interpreter implements \
meta/recipes-graphics/cairo/cairo_1.16.0.bb do_install:append () { · line 93
Quoted 10 lines
meta/recipes-graphics/cairo/cairo_1.16.0.bb +3
-1+SUMMARY:${PN}-script-interpreter = "The Cairo library script interpreter" +DESCRIPTION:${PN}-script-interpreter = "The Cairo script interpreter implements \ CairoScript. CairoScript is used by tracing utilities to enable the ability \ to replay rendering." -DESCRIPTION:cairo-perf-utils = "The Cairo library performance utilities" +DESCRIPTION:${PN}-perf-utils = "The Cairo library performance utilities" FILES:${PN} = "${libdir}/libcairo.so.*" FILES:${PN}-gobject = "${libdir}/libcairo-gobject.so.*"
How do we reproduce the error? We're not seeing this and this change shouldn't be needed, PACKAGES just needs to match the variable usage which it does here. I'd like to understand the issue before we can try and fix it.
Cheers,
Richard
A message that is not in the archive (sent off-list or not yet received): CO1PR10MB443438D0A26177CABAB54BCFF9B09@CO1PR10MB4434.namprd10.prod.outlook.com
Quoted 8 lines · Steven Walter
Sorry about that, should have included this in the commit message. I believe multilib is required for reproducing the issue. I have a 32-bit ARM multilib. In that case, ${PN} is lib32-cairo, and so LICENSE gets set on lib32-cairo-gobject, but PACKAGES contains cairo-gobject. As a result the effective LICENSE of cairo-gobject is the "default" license for the recipe, which is GPL3, which is incorrect. So when I said "bitbake complains that the license is incorrect," I have
INCOMPATIBLE_LICENSE= "GPL-3.0", and bitbake incorrectly says that I can't use the cairo-gobject package.
Are you testing this with master? If not, which release? I know there were some multilib issues in this area a while ago but I thought/hoped we'd fixed them.
Both PACKAGES and LICENSE:XXX should get remapped but it sounds like the incompatible license code is evaluating something too early. That is once reason why I'd like to check this reproduces with master first.
Cheers,
Richard
A message that is not in the archive (sent off-list or not yet received): CO1PR10MB44342798D12267B2DCF6FA9EF9B09@CO1PR10MB4434.namprd10.prod.outlook.com
Quoted 1 line · Steven Walter
I have reproduced it with 23.0.10
That sounds like dunfell and there have definitely been fixes for this since dunfell that weren't easily ported into the LTS.
Cheers,
Richard