* [PATCH] util-linux.inc: Set the correct license for util-linux-libuuid again
@ 2021-03-24 19:15 Peter Kjellerstedt
2021-03-24 21:35 ` [OE-core] " Richard Purdie
0 siblings, 1 reply; 6+ messages in thread
From: Peter Kjellerstedt @ 2021-03-24 19:15 UTC (permalink / raw)
To: openembedded-core
LICENSE_${PN}-libuuid was not updated when libuuid was moved to the
util-linux-uuid recipe. Use LICENSE_${BPN}-libuuid instead as BPN is
set to "util-linux" for both util-linux and util-linux-uuid.
Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com>
---
meta/recipes-core/util-linux/util-linux.inc | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/meta/recipes-core/util-linux/util-linux.inc b/meta/recipes-core/util-linux/util-linux.inc
index 4031c586c9..bb93eb67d6 100644
--- a/meta/recipes-core/util-linux/util-linux.inc
+++ b/meta/recipes-core/util-linux/util-linux.inc
@@ -7,11 +7,11 @@ disk partitioning, kernel message management, filesystem creation, and system lo
SECTION = "base"
LICENSE = "GPLv2+ & LGPLv2.1+ & BSD-3-Clause & BSD-4-Clause"
-LICENSE_${PN}-libblkid = "LGPLv2.1+"
-LICENSE_${PN}-libfdisk = "LGPLv2.1+"
-LICENSE_${PN}-libmount = "LGPLv2.1+"
-LICENSE_${PN}-libsmartcols = "LGPLv2.1+"
-LICENSE_${PN}-libuuid = "BSD-3-Clause"
+LICENSE_${BPN}-libblkid = "LGPLv2.1+"
+LICENSE_${BPN}-libfdisk = "LGPLv2.1+"
+LICENSE_${BPN}-libmount = "LGPLv2.1+"
+LICENSE_${BPN}-libsmartcols = "LGPLv2.1+"
+LICENSE_${BPN}-libuuid = "BSD-3-Clause"
LIC_FILES_CHKSUM = "file://README.licensing;md5=0fd5c050c6187d2bf0a4492b7f4e33da \
file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [OE-core] [PATCH] util-linux.inc: Set the correct license for util-linux-libuuid again
2021-03-24 19:15 [PATCH] util-linux.inc: Set the correct license for util-linux-libuuid again Peter Kjellerstedt
@ 2021-03-24 21:35 ` Richard Purdie
2021-03-24 22:38 ` Peter Kjellerstedt
0 siblings, 1 reply; 6+ messages in thread
From: Richard Purdie @ 2021-03-24 21:35 UTC (permalink / raw)
To: Peter Kjellerstedt, openembedded-core
On Wed, 2021-03-24 at 20:15 +0100, Peter Kjellerstedt wrote:
> LICENSE_${PN}-libuuid was not updated when libuuid was moved to the
> util-linux-uuid recipe. Use LICENSE_${BPN}-libuuid instead as BPN is
> set to "util-linux" for both util-linux and util-linux-uuid.
>
> Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com>
> ---
> meta/recipes-core/util-linux/util-linux.inc | 10 +++++-----
> 1 file changed, 5 insertions(+), 5 deletions(-)
>
> diff --git a/meta/recipes-core/util-linux/util-linux.inc b/meta/recipes-core/util-linux/util-linux.inc
> index 4031c586c9..bb93eb67d6 100644
> --- a/meta/recipes-core/util-linux/util-linux.inc
> +++ b/meta/recipes-core/util-linux/util-linux.inc
> @@ -7,11 +7,11 @@ disk partitioning, kernel message management, filesystem creation, and system lo
> SECTION = "base"
> LICENSE = "GPLv2+ & LGPLv2.1+ & BSD-3-Clause & BSD-4-Clause"
> -LICENSE_${PN}-libblkid = "LGPLv2.1+"
> -LICENSE_${PN}-libfdisk = "LGPLv2.1+"
> -LICENSE_${PN}-libmount = "LGPLv2.1+"
> -LICENSE_${PN}-libsmartcols = "LGPLv2.1+"
> -LICENSE_${PN}-libuuid = "BSD-3-Clause"
> +LICENSE_${BPN}-libblkid = "LGPLv2.1+"
> +LICENSE_${BPN}-libfdisk = "LGPLv2.1+"
> +LICENSE_${BPN}-libmount = "LGPLv2.1+"
> +LICENSE_${BPN}-libsmartcols = "LGPLv2.1+"
> +LICENSE_${BPN}-libuuid = "BSD-3-Clause"
How was this tested? This will not work for multilibs or nativesdk.
Cheers,
Richard
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [OE-core] [PATCH] util-linux.inc: Set the correct license for util-linux-libuuid again
2021-03-24 21:35 ` [OE-core] " Richard Purdie
@ 2021-03-24 22:38 ` Peter Kjellerstedt
2021-03-24 22:40 ` Richard Purdie
0 siblings, 1 reply; 6+ messages in thread
From: Peter Kjellerstedt @ 2021-03-24 22:38 UTC (permalink / raw)
To: Richard Purdie, openembedded-core
> -----Original Message-----
> From: Richard Purdie <richard.purdie@linuxfoundation.org>
> Sent: den 24 mars 2021 22:35
> To: Peter Kjellerstedt <peter.kjellerstedt@axis.com>; openembedded-
> core@lists.openembedded.org
> Subject: Re: [OE-core] [PATCH] util-linux.inc: Set the correct license for
> util-linux-libuuid again
>
> On Wed, 2021-03-24 at 20:15 +0100, Peter Kjellerstedt wrote:
> > LICENSE_${PN}-libuuid was not updated when libuuid was moved to the
> > util-linux-uuid recipe. Use LICENSE_${BPN}-libuuid instead as BPN is
> > set to "util-linux" for both util-linux and util-linux-uuid.
> >
> > Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com>
> > ---
> > meta/recipes-core/util-linux/util-linux.inc | 10 +++++-----
> > 1 file changed, 5 insertions(+), 5 deletions(-)
> >
> > diff --git a/meta/recipes-core/util-linux/util-linux.inc b/meta/recipes-
> core/util-linux/util-linux.inc
> > index 4031c586c9..bb93eb67d6 100644
> > --- a/meta/recipes-core/util-linux/util-linux.inc
> > +++ b/meta/recipes-core/util-linux/util-linux.inc
> > @@ -7,11 +7,11 @@ disk partitioning, kernel message management,
> filesystem creation, and system lo
> > SECTION = "base"
> > LICENSE = "GPLv2+ & LGPLv2.1+ & BSD-3-Clause & BSD-4-Clause"
> > -LICENSE_${PN}-libblkid = "LGPLv2.1+"
> > -LICENSE_${PN}-libfdisk = "LGPLv2.1+"
> > -LICENSE_${PN}-libmount = "LGPLv2.1+"
> > -LICENSE_${PN}-libsmartcols = "LGPLv2.1+"
> > -LICENSE_${PN}-libuuid = "BSD-3-Clause"
> > +LICENSE_${BPN}-libblkid = "LGPLv2.1+"
> > +LICENSE_${BPN}-libfdisk = "LGPLv2.1+"
> > +LICENSE_${BPN}-libmount = "LGPLv2.1+"
> > +LICENSE_${BPN}-libsmartcols = "LGPLv2.1+"
> > +LICENSE_${BPN}-libuuid = "BSD-3-Clause"
>
> How was this tested? This will not work for multilibs or nativesdk.
Well, we don't use either, so obviously I only tested building for
target. However, I believe it should work. At least `bitbake -e
nativesdk-util-linux-uuid` shows the expected value for
LICENSE_nativesdk-util-linux-libuuid.
Note that BPN is explicitly set in the util-linux.inc file to
"util-linux", so the definitions above should be no different than
if I had used LICENSE_util-linux-libuuid = "BSD-3-Clause"
Or am I missing something?
> Cheers,
>
> Richard
//Peter
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [OE-core] [PATCH] util-linux.inc: Set the correct license for util-linux-libuuid again
2021-03-24 22:38 ` Peter Kjellerstedt
@ 2021-03-24 22:40 ` Richard Purdie
2021-03-24 22:57 ` Peter Kjellerstedt
[not found] ` <166F695FD066C0E5.4371@lists.openembedded.org>
0 siblings, 2 replies; 6+ messages in thread
From: Richard Purdie @ 2021-03-24 22:40 UTC (permalink / raw)
To: Peter Kjellerstedt, openembedded-core
On Wed, 2021-03-24 at 22:38 +0000, Peter Kjellerstedt wrote:
> > -----Original Message-----
> > From: Richard Purdie <richard.purdie@linuxfoundation.org>
> > Sent: den 24 mars 2021 22:35
> > To: Peter Kjellerstedt <peter.kjellerstedt@axis.com>; openembedded-
> > core@lists.openembedded.org
> > Subject: Re: [OE-core] [PATCH] util-linux.inc: Set the correct license for
> > util-linux-libuuid again
> >
> > On Wed, 2021-03-24 at 20:15 +0100, Peter Kjellerstedt wrote:
> > > LICENSE_${PN}-libuuid was not updated when libuuid was moved to the
> > > util-linux-uuid recipe. Use LICENSE_${BPN}-libuuid instead as BPN is
> > > set to "util-linux" for both util-linux and util-linux-uuid.
> > >
> > > Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com>
> > > ---
> > > meta/recipes-core/util-linux/util-linux.inc | 10 +++++-----
> > > 1 file changed, 5 insertions(+), 5 deletions(-)
> > >
> > > diff --git a/meta/recipes-core/util-linux/util-linux.inc b/meta/recipes-
> > core/util-linux/util-linux.inc
> > > index 4031c586c9..bb93eb67d6 100644
> > > --- a/meta/recipes-core/util-linux/util-linux.inc
> > > +++ b/meta/recipes-core/util-linux/util-linux.inc
> > > @@ -7,11 +7,11 @@ disk partitioning, kernel message management,
> > filesystem creation, and system lo
> > > SECTION = "base"
> > > LICENSE = "GPLv2+ & LGPLv2.1+ & BSD-3-Clause & BSD-4-Clause"
> > > -LICENSE_${PN}-libblkid = "LGPLv2.1+"
> > > -LICENSE_${PN}-libfdisk = "LGPLv2.1+"
> > > -LICENSE_${PN}-libmount = "LGPLv2.1+"
> > > -LICENSE_${PN}-libsmartcols = "LGPLv2.1+"
> > > -LICENSE_${PN}-libuuid = "BSD-3-Clause"
> > > +LICENSE_${BPN}-libblkid = "LGPLv2.1+"
> > > +LICENSE_${BPN}-libfdisk = "LGPLv2.1+"
> > > +LICENSE_${BPN}-libmount = "LGPLv2.1+"
> > > +LICENSE_${BPN}-libsmartcols = "LGPLv2.1+"
> > > +LICENSE_${BPN}-libuuid = "BSD-3-Clause"
> >
> > How was this tested? This will not work for multilibs or nativesdk.
>
> Well, we don't use either, so obviously I only tested building for
> target. However, I believe it should work. At least `bitbake -e
> nativesdk-util-linux-uuid` shows the expected value for
> LICENSE_nativesdk-util-linux-libuuid.
>
> Note that BPN is explicitly set in the util-linux.inc file to
> "util-linux", so the definitions above should be no different than
> if I had used LICENSE_util-linux-libuuid = "BSD-3-Clause"
> Or am I missing something?
It may fix libuuid but I think it will break libblkid and the others.
Cheers,
Richard
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [OE-core] [PATCH] util-linux.inc: Set the correct license for util-linux-libuuid again
2021-03-24 22:40 ` Richard Purdie
@ 2021-03-24 22:57 ` Peter Kjellerstedt
[not found] ` <166F695FD066C0E5.4371@lists.openembedded.org>
1 sibling, 0 replies; 6+ messages in thread
From: Peter Kjellerstedt @ 2021-03-24 22:57 UTC (permalink / raw)
To: Richard Purdie, openembedded-core
> -----Original Message-----
> From: Richard Purdie <richard.purdie@linuxfoundation.org>
> Sent: den 24 mars 2021 23:40
> To: Peter Kjellerstedt <peter.kjellerstedt@axis.com>; openembedded-
> core@lists.openembedded.org
> Subject: Re: [OE-core] [PATCH] util-linux.inc: Set the correct license for
> util-linux-libuuid again
>
> On Wed, 2021-03-24 at 22:38 +0000, Peter Kjellerstedt wrote:
> > > -----Original Message-----
> > > From: Richard Purdie <richard.purdie@linuxfoundation.org>
> > > Sent: den 24 mars 2021 22:35
> > > To: Peter Kjellerstedt <peter.kjellerstedt@axis.com>; openembedded-
> > > core@lists.openembedded.org
> > > Subject: Re: [OE-core] [PATCH] util-linux.inc: Set the correct license
> for
> > > util-linux-libuuid again
> > >
> > > On Wed, 2021-03-24 at 20:15 +0100, Peter Kjellerstedt wrote:
> > > > LICENSE_${PN}-libuuid was not updated when libuuid was moved to the
> > > > util-linux-uuid recipe. Use LICENSE_${BPN}-libuuid instead as BPN is
> > > > set to "util-linux" for both util-linux and util-linux-uuid.
> > > >
> > > > Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com>
> > > > ---
> > > > meta/recipes-core/util-linux/util-linux.inc | 10 +++++-----
> > > > 1 file changed, 5 insertions(+), 5 deletions(-)
> > > >
> > > > diff --git a/meta/recipes-core/util-linux/util-linux.inc
> b/meta/recipes-
> > > core/util-linux/util-linux.inc
> > > > index 4031c586c9..bb93eb67d6 100644
> > > > --- a/meta/recipes-core/util-linux/util-linux.inc
> > > > +++ b/meta/recipes-core/util-linux/util-linux.inc
> > > > @@ -7,11 +7,11 @@ disk partitioning, kernel message management,
> > > filesystem creation, and system lo
> > > > SECTION = "base"
> > > > LICENSE = "GPLv2+ & LGPLv2.1+ & BSD-3-Clause & BSD-4-Clause"
> > > > -LICENSE_${PN}-libblkid = "LGPLv2.1+"
> > > > -LICENSE_${PN}-libfdisk = "LGPLv2.1+"
> > > > -LICENSE_${PN}-libmount = "LGPLv2.1+"
> > > > -LICENSE_${PN}-libsmartcols = "LGPLv2.1+"
> > > > -LICENSE_${PN}-libuuid = "BSD-3-Clause"
> > > > +LICENSE_${BPN}-libblkid = "LGPLv2.1+"
> > > > +LICENSE_${BPN}-libfdisk = "LGPLv2.1+"
> > > > +LICENSE_${BPN}-libmount = "LGPLv2.1+"
> > > > +LICENSE_${BPN}-libsmartcols = "LGPLv2.1+"
> > > > +LICENSE_${BPN}-libuuid = "BSD-3-Clause"
> > >
> > > How was this tested? This will not work for multilibs or nativesdk.
> >
> > Well, we don't use either, so obviously I only tested building for
> > target. However, I believe it should work. At least `bitbake -e
> > nativesdk-util-linux-uuid` shows the expected value for
> > LICENSE_nativesdk-util-linux-libuuid.
> >
> > Note that BPN is explicitly set in the util-linux.inc file to
> > "util-linux", so the definitions above should be no different than
> > if I had used LICENSE_util-linux-libuuid = "BSD-3-Clause"
> > Or am I missing something?
>
> It may fix libuuid but I think it will break libblkid and the others.
AFAICT, it looks correct when I try `bitbake -e util-linux` and
`bitbake -e nativesdk-util-linux`.
> Cheers,
>
> Richard
//Peter
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [OE-core] [PATCH] util-linux.inc: Set the correct license for util-linux-libuuid again
[not found] ` <166F695FD066C0E5.4371@lists.openembedded.org>
@ 2021-03-24 23:51 ` Peter Kjellerstedt
0 siblings, 0 replies; 6+ messages in thread
From: Peter Kjellerstedt @ 2021-03-24 23:51 UTC (permalink / raw)
To: Richard Purdie, openembedded-core
> -----Original Message-----
> From: openembedded-core@lists.openembedded.org <openembedded-
> core@lists.openembedded.org> On Behalf Of Peter Kjellerstedt
> Sent: den 24 mars 2021 23:57
> To: Richard Purdie <richard.purdie@linuxfoundation.org>; openembedded-
> core@lists.openembedded.org
> Subject: Re: [OE-core] [PATCH] util-linux.inc: Set the correct license for
> util-linux-libuuid again
>
> > -----Original Message-----
> > From: Richard Purdie <richard.purdie@linuxfoundation.org>
> > Sent: den 24 mars 2021 23:40
> > To: Peter Kjellerstedt <peter.kjellerstedt@axis.com>; openembedded-
> > core@lists.openembedded.org
> > Subject: Re: [OE-core] [PATCH] util-linux.inc: Set the correct license
> for
> > util-linux-libuuid again
> >
> > On Wed, 2021-03-24 at 22:38 +0000, Peter Kjellerstedt wrote:
> > > > -----Original Message-----
> > > > From: Richard Purdie <richard.purdie@linuxfoundation.org>
> > > > Sent: den 24 mars 2021 22:35
> > > > To: Peter Kjellerstedt <peter.kjellerstedt@axis.com>; openembedded-
> > > > core@lists.openembedded.org
> > > > Subject: Re: [OE-core] [PATCH] util-linux.inc: Set the correct
> license
> > for
> > > > util-linux-libuuid again
> > > >
> > > > On Wed, 2021-03-24 at 20:15 +0100, Peter Kjellerstedt wrote:
> > > > > LICENSE_${PN}-libuuid was not updated when libuuid was moved to
> the
> > > > > util-linux-uuid recipe. Use LICENSE_${BPN}-libuuid instead as BPN
> is
> > > > > set to "util-linux" for both util-linux and util-linux-uuid.
> > > > >
> > > > > Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com>
> > > > > ---
> > > > > meta/recipes-core/util-linux/util-linux.inc | 10 +++++-----
> > > > > 1 file changed, 5 insertions(+), 5 deletions(-)
> > > > >
> > > > > diff --git a/meta/recipes-core/util-linux/util-linux.inc
> > b/meta/recipes-
> > > > core/util-linux/util-linux.inc
> > > > > index 4031c586c9..bb93eb67d6 100644
> > > > > --- a/meta/recipes-core/util-linux/util-linux.inc
> > > > > +++ b/meta/recipes-core/util-linux/util-linux.inc
> > > > > @@ -7,11 +7,11 @@ disk partitioning, kernel message management,
> > > > filesystem creation, and system lo
> > > > > SECTION = "base"
> > > > > LICENSE = "GPLv2+ & LGPLv2.1+ & BSD-3-Clause & BSD-4-Clause"
> > > > > -LICENSE_${PN}-libblkid = "LGPLv2.1+"
> > > > > -LICENSE_${PN}-libfdisk = "LGPLv2.1+"
> > > > > -LICENSE_${PN}-libmount = "LGPLv2.1+"
> > > > > -LICENSE_${PN}-libsmartcols = "LGPLv2.1+"
> > > > > -LICENSE_${PN}-libuuid = "BSD-3-Clause"
> > > > > +LICENSE_${BPN}-libblkid = "LGPLv2.1+"
> > > > > +LICENSE_${BPN}-libfdisk = "LGPLv2.1+"
> > > > > +LICENSE_${BPN}-libmount = "LGPLv2.1+"
> > > > > +LICENSE_${BPN}-libsmartcols = "LGPLv2.1+"
> > > > > +LICENSE_${BPN}-libuuid = "BSD-3-Clause"
> > > >
> > > > How was this tested? This will not work for multilibs or nativesdk.
> > >
> > > Well, we don't use either, so obviously I only tested building for
> > > target. However, I believe it should work. At least `bitbake -e
> > > nativesdk-util-linux-uuid` shows the expected value for
> > > LICENSE_nativesdk-util-linux-libuuid.
> > >
> > > Note that BPN is explicitly set in the util-linux.inc file to
> > > "util-linux", so the definitions above should be no different than
> > > if I had used LICENSE_util-linux-libuuid = "BSD-3-Clause"
> > > Or am I missing something?
> >
> > It may fix libuuid but I think it will break libblkid and the others.
>
> AFAICT, it looks correct when I try `bitbake -e util-linux` and
> `bitbake -e nativesdk-util-linux`.
Scratch that, I was looking in the wrong tree. :/ You are correct, it
only seems the LICENSE_${BPN}-libuuid is correctly renamed to
LICENSE_nativesdk-util-linux-libuuid for nativesdk-util-linux-uuid, while
the others retain their non-nativesdk names for nativesdk-util-linux.
I guess there is some magic involved here that I am not aware of.
Thinking a bit more about this, I wonder whether the best option may
be to set LICENSE = "BSD-3-Clause" in the util-linux-uuid recipe, and
move the other LICENSE variables to the util-linux recipe. I will
send another patch to do this instead.
> > Cheers,
> >
> > Richard
>
> //Peter
//Peter
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2021-03-24 23:51 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-03-24 19:15 [PATCH] util-linux.inc: Set the correct license for util-linux-libuuid again Peter Kjellerstedt
2021-03-24 21:35 ` [OE-core] " Richard Purdie
2021-03-24 22:38 ` Peter Kjellerstedt
2021-03-24 22:40 ` Richard Purdie
2021-03-24 22:57 ` Peter Kjellerstedt
[not found] ` <166F695FD066C0E5.4371@lists.openembedded.org>
2021-03-24 23:51 ` Peter Kjellerstedt
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.