[PATCH] cairo: work around multilib issue resulting in improper handling of licenses

[PATCH] cairo: work around multilib issue resulting in improper handling of licenses

[Quentin Schulz]

There is currently an issue when a LICENSE for a package is defined
differently than how the package is defined in PACKAGES.

See bug tracker: http://bugzilla.yoctoproject.org/show_bug.cgi?id=13865

This results in LICENSE being taken instead of LICENSE_${PN}-gobject
because the latter is expanded to LICENSE_lib32-cairo-gobject while the
entry in PACKAGES is still cairo-object at the moment of setting
LICENSE_EXCLUSION in base.bbclass.

This means that instead of the expected MPL-1.1 | LGPLv2.1 license for
lib32-cairo-object, it is (MPL-1.1 | LGPLv2.1) & GPLv3+ which does not
work when you have INCOMPATIBLE_LICENSE set to GPLv3.

Same applies to cairo-perf-utils and cairo-script-interpreter.

Let's use ${PN} instead of hardcoded cairo in PACKAGES so that we
mitigate the multilib issue on this recipe level.

Signed-off-by: Quentin Schulz <quentin.schulz@streamunlimited.com>
---
 meta/recipes-graphics/cairo/cairo_1.16.0.bb | 2 +-
 1 file changed, 1 insertion(+), 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 b772c2ece2..e18159e96c 100644
--- a/meta/recipes-graphics/cairo/cairo_1.16.0.bb
+++ b/meta/recipes-graphics/cairo/cairo_1.16.0.bb
@@ -72,7 +72,7 @@ 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."
-- 
2.17.1

Re: [OE-core] [PATCH] cairo: work around multilib issue resulting in improper handling of licenses

[Paul Barker]

On Thu,  9 Apr 2020 13:04:23 +0200
"Quentin Schulz" <quentin.schulz@streamunlimited.com> wrote:

> There is currently an issue when a LICENSE for a package is defined
> differently than how the package is defined in PACKAGES.
> 
> See bug tracker: http://bugzilla.yoctoproject.org/show_bug.cgi?id=13865
> 
> This results in LICENSE being taken instead of LICENSE_${PN}-gobject
> because the latter is expanded to LICENSE_lib32-cairo-gobject while the
> entry in PACKAGES is still cairo-object at the moment of setting
> LICENSE_EXCLUSION in base.bbclass.
> 
> This means that instead of the expected MPL-1.1 | LGPLv2.1 license for
> lib32-cairo-object, it is (MPL-1.1 | LGPLv2.1) & GPLv3+ which does not
> work when you have INCOMPATIBLE_LICENSE set to GPLv3.
> 
> Same applies to cairo-perf-utils and cairo-script-interpreter.
> 
> Let's use ${PN} instead of hardcoded cairo in PACKAGES so that we
> mitigate the multilib issue on this recipe level.
> 
> Signed-off-by: Quentin Schulz <quentin.schulz@streamunlimited.com>
> ---
>  meta/recipes-graphics/cairo/cairo_1.16.0.bb | 2 +-
>  1 file changed, 1 insertion(+), 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 b772c2ece2..e18159e96c 100644
> --- a/meta/recipes-graphics/cairo/cairo_1.16.0.bb
> +++ b/meta/recipes-graphics/cairo/cairo_1.16.0.bb
> @@ -72,7 +72,7 @@ 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."

Should we also change these entries to `SUMMARY_${PN}-gobject` and
`DESCRIPTION_${PN}-gobject`? There may be others as well, I'm just looking at
the diff not the full recipe.

Thanks,

-- 
Paul Barker
Konsulko Group

Re: [OE-core] [PATCH] cairo: work around multilib issue resulting in improper handling of licenses

[Quentin Schulz]

Hi Paul,

On Thu, Apr 09, 2020 at 12:17:00PM +0100, Paul Barker wrote:
> On Thu,  9 Apr 2020 13:04:23 +0200
> "Quentin Schulz" <quentin.schulz@streamunlimited.com> wrote:
> 
> > There is currently an issue when a LICENSE for a package is defined
> > differently than how the package is defined in PACKAGES.
> > 
> > See bug tracker: http://bugzilla.yoctoproject.org/show_bug.cgi?id=13865
> > 
> > This results in LICENSE being taken instead of LICENSE_${PN}-gobject
> > because the latter is expanded to LICENSE_lib32-cairo-gobject while the
> > entry in PACKAGES is still cairo-object at the moment of setting
> > LICENSE_EXCLUSION in base.bbclass.
> > 
> > This means that instead of the expected MPL-1.1 | LGPLv2.1 license for
> > lib32-cairo-object, it is (MPL-1.1 | LGPLv2.1) & GPLv3+ which does not
> > work when you have INCOMPATIBLE_LICENSE set to GPLv3.
> > 
> > Same applies to cairo-perf-utils and cairo-script-interpreter.
> > 
> > Let's use ${PN} instead of hardcoded cairo in PACKAGES so that we
> > mitigate the multilib issue on this recipe level.
> > 
> > Signed-off-by: Quentin Schulz <quentin.schulz@streamunlimited.com>
> > ---
> >  meta/recipes-graphics/cairo/cairo_1.16.0.bb | 2 +-
> >  1 file changed, 1 insertion(+), 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 b772c2ece2..e18159e96c 100644
> > --- a/meta/recipes-graphics/cairo/cairo_1.16.0.bb
> > +++ b/meta/recipes-graphics/cairo/cairo_1.16.0.bb
> > @@ -72,7 +72,7 @@ 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."
> 
> Should we also change these entries to `SUMMARY_${PN}-gobject` and
> `DESCRIPTION_${PN}-gobject`? There may be others as well, I'm just looking at
> the diff not the full recipe.
> 

We could for consistency but those aren't impacted by the bug (I checked
in tmp/pkgdata/<machine>/runtime/lib32-cairo-*).

Would you want me to change them anyway?

Quentin

Re: [OE-core] [PATCH] cairo: work around multilib issue resulting in improper handling of licenses

[Quentin Schulz]

Hi,

On Thu, Apr 09, 2020 at 12:17:00PM +0100, Paul Barker wrote:
> On Thu,  9 Apr 2020 13:04:23 +0200
> "Quentin Schulz" <quentin.schulz@streamunlimited.com> wrote:
> 
> > There is currently an issue when a LICENSE for a package is defined
> > differently than how the package is defined in PACKAGES.
> > 
> > See bug tracker: http://bugzilla.yoctoproject.org/show_bug.cgi?id=13865
> > 
> > This results in LICENSE being taken instead of LICENSE_${PN}-gobject
> > because the latter is expanded to LICENSE_lib32-cairo-gobject while the
> > entry in PACKAGES is still cairo-object at the moment of setting
> > LICENSE_EXCLUSION in base.bbclass.
> > 
> > This means that instead of the expected MPL-1.1 | LGPLv2.1 license for
> > lib32-cairo-object, it is (MPL-1.1 | LGPLv2.1) & GPLv3+ which does not
> > work when you have INCOMPATIBLE_LICENSE set to GPLv3.
> > 
> > Same applies to cairo-perf-utils and cairo-script-interpreter.
> > 
> > Let's use ${PN} instead of hardcoded cairo in PACKAGES so that we
> > mitigate the multilib issue on this recipe level.
> > 
> > Signed-off-by: Quentin Schulz <quentin.schulz@streamunlimited.com>
> > ---
> >  meta/recipes-graphics/cairo/cairo_1.16.0.bb | 2 +-
> >  1 file changed, 1 insertion(+), 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 b772c2ece2..e18159e96c 100644
> > --- a/meta/recipes-graphics/cairo/cairo_1.16.0.bb
> > +++ b/meta/recipes-graphics/cairo/cairo_1.16.0.bb
> > @@ -72,7 +72,7 @@ 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."
> 
> Should we also change these entries to `SUMMARY_${PN}-gobject` and
> `DESCRIPTION_${PN}-gobject`? There may be others as well, I'm just looking at
> the diff not the full recipe.
> 

Please ignore, the issue is being worked on by Richard in the linked bugzilla
entry.

Quentin