util-linux.inc: Set the correct license for util-linux-libuuid again
PATCH 1/1 util-linux.inc: Set the correct license for util-linux-libuuid again
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.
--- meta/recipes-core/util-linux/util-linux.inc | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
meta/recipes-core/util-linux/util-linux.inc +5 -5
@@ -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 \
Quoted 16 lines · Peter Kjellerstedt
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 <[email protected]>---
meta/recipes-core/util-linux/util-linux.inc | 10 +++++-----1 file changed, 5 insertions(+), 5 deletions(-)meta/recipes-core/util-linux/util-linux.inc +0
-0@@ -7,11 +7,11 @@ disk partitioning, kernel message management, filesystem creation, and system loSECTION = "base"
LICENSE = "GPLv2+ & LGPLv2.1+ & BSD-3-Clause & BSD-4-Clause"
meta/recipes-core/util-linux/util-linux.inc disk partitioning, kernel message management, filesystem creation, and system lo · line 14
Quoted 10 lines
meta/recipes-core/util-linux/util-linux.inc +5
-5-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
Quoted 25 lines
-----Original Message-----
From: Richard Purdie <[email protected]>
Sent: den 24 mars 2021 22:35
To: Peter Kjellerstedt <[email protected]>; openembedded- [email protected]
Subject: Re: [OE-core] [PATCH] util-linux.inc: Set the correct license for util-linux-libuuid againmeta/recipes-
Quoted 10 lines · Peter Kjellerstedt
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 <[email protected]>---
meta/recipes-core/util-linux/util-linux.inc | 10 +++++-----1 file changed, 5 insertions(+), 5 deletions(-)meta/recipes- renamed from meta/recipes-core/util-linux/util-linux.inc +0
-0core/util-linux/util-linux.inc
meta/recipes-core/util-linux/util-linux.inc disk partitioning, kernel message management,
Quoted 4 lines
index
4031c586c9..bb93eb67d6100644meta/recipes-core/util-linux/util-linux.inc +0
-0@@ -7,11 +7,11 @@ disk partitioning, kernel message management,filesystem creation, and system lo
Quoted 14 lines
meta/recipes-core/util-linux/util-linux.inc disk partitioning, kernel message management, filesystem creation, and system lo · line 14
Quoted 12 lines
SECTION = "base"
LICENSE = "GPLv2+ & LGPLv2.1+ & BSD-3-Clause & BSD-4-Clause"meta/recipes-core/util-linux/util-linux.inc +5
-5-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?
Quoted 3 lines
Cheers,
Richard
//Peter
Quoted 45 lines · Peter Kjellerstedt
Quoted 25 lines
-----Original Message-----
From: Richard Purdie <[email protected]>
Sent: den 24 mars 2021 22:35
To: Peter Kjellerstedt <[email protected]>; openembedded- [email protected]
Subject: Re: [OE-core] [PATCH] util-linux.inc: Set the correct license for util-linux-libuuid againmeta/recipes-
Quoted 10 lines · Peter Kjellerstedt
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 <[email protected]>---
meta/recipes-core/util-linux/util-linux.inc | 10 +++++-----1 file changed, 5 insertions(+), 5 deletions(-)meta/recipes- renamed from meta/recipes-core/util-linux/util-linux.inc +0
-0core/util-linux/util-linux.inc
meta/recipes-core/util-linux/util-linux.inc disk partitioning, kernel message management,
Quoted 4 lines
index
4031c586c9..bb93eb67d6100644meta/recipes-core/util-linux/util-linux.inc +0
-0@@ -7,11 +7,11 @@ disk partitioning, kernel message management,filesystem creation, and system lo
Quoted 14 lines
meta/recipes-core/util-linux/util-linux.inc disk partitioning, kernel message management, filesystem creation, and system lo · line 14
Quoted 12 lines
SECTION = "base"
LICENSE = "GPLv2+ & LGPLv2.1+ & BSD-3-Clause & BSD-4-Clause"meta/recipes-core/util-linux/util-linux.inc +5
-5-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-uuidshows the expected value for LICENSE_nativesdk-util-linux-libuuid.
Quoted 4 lines
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
Quoted 56 lines
-----Original Message-----
From: Richard Purdie <[email protected]>
Sent: den 24 mars 2021 23:40
To: Peter Kjellerstedt <[email protected]>; openembedded- [email protected]
Subject: Re: [OE-core] [PATCH] util-linux.inc: Set the correct license for util-linux-libuuid againQuoted 6 lines · Peter Kjellerstedt
Quoted 6 lines
-----Original Message-----
From: Richard Purdie <[email protected]>
Sent: den 24 mars 2021 22:35
To: Peter Kjellerstedt <[email protected]>; openembedded- [email protected]
Subject: Re: [OE-core] [PATCH] util-linux.inc: Set the correct licensefor
Quoted 7 lines
Quoted 7 lines
util-linux-libuuid again
Quoted 4 lines · Peter Kjellerstedt
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.
Quoted 6 lines
Quoted 6 lines
Review
Quoted 6 lines
Signed-off-by Peter Kjellerstedt <[email protected]>---
meta/recipes-core/util-linux/util-linux.inc | 10 +++++-----1 file changed, 5 insertions(+), 5 deletions(-)(quoted diff) +0
-0b/meta/recipes-
Quoted 26 lines
Quoted 6 lines
core/util-linux/util-linux.inc
meta/recipes-core/util-linux/util-linux.inc disk partitioning, kernel message management,
Quoted 4 lines
index
4031c586c9..bb93eb67d6100644meta/recipes-core/util-linux/util-linux.inc +0
-0@@ -7,11 +7,11 @@ disk partitioning, kernel message management,filesystem creation, and system lo
Quoted 14 lines
meta/recipes-core/util-linux/util-linux.inc disk partitioning, kernel message management, filesystem creation, and system lo · line 14
Quoted 12 lines
SECTION = "base"
LICENSE = "GPLv2+ & LGPLv2.1+ & BSD-3-Clause & BSD-4-Clause"meta/recipes-core/util-linux/util-linux.inc +5
-5-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-uuidshows the expected value for LICENSE_nativesdk-util-linux-libuuid.
Quoted 6 lines
Quoted 4 lines
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.
Quoted 3 lines
Cheers,
Richard
//Peter
A message that is not in the archive (sent off-list or not yet received): [email protected]
Quoted 74 lines
-----Original Message-----
From: [email protected] <openembedded- [email protected]> On Behalf Of Peter Kjellerstedt
Sent: den 24 mars 2021 23:57
To: Richard Purdie <[email protected]>; openembedded- [email protected]
Subject: Re: [OE-core] [PATCH] util-linux.inc: Set the correct license for util-linux-libuuid againQuoted 6 lines
-----Original Message-----
From: Richard Purdie <[email protected]>
Sent: den 24 mars 2021 23:40
To: Peter Kjellerstedt <[email protected]>; openembedded- [email protected]
Subject: Re: [OE-core] [PATCH] util-linux.inc: Set the correct licensefor
Quoted 9 lines
util-linux-libuuid again
Quoted 6 lines · Peter Kjellerstedt
Quoted 6 lines
-----Original Message-----
From: Richard Purdie <[email protected]>
Sent: den 24 mars 2021 22:35
To: Peter Kjellerstedt <[email protected]>; openembedded- [email protected]
Subject: Re: [OE-core] [PATCH] util-linux.inc: Set the correctlicense
Quoted 5 lines
for
Quoted 4 lines
Quoted 4 lines
util-linux-libuuid again
Quoted 1 line · Peter Kjellerstedt
LICENSE_${PN}-libuuid was not updated when libuuid was moved to
the
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
util-linux-uuid recipe. Use LICENSE_${BPN}-libuuid instead as BPN
is
Quoted 40 lines
Quoted 8 lines
Quoted 8 lines
Review
Quoted 8 lines
set to "util-linux" for both util-linux and util-linux-uuid.
Signed-off-by Peter Kjellerstedt <[email protected]>---
meta/recipes-core/util-linux/util-linux.inc | 10 +++++-----1 file changed, 5 insertions(+), 5 deletions(-)(quoted diff) +0
-0b/meta/recipes-
Quoted 30 lines
Quoted 6 lines
core/util-linux/util-linux.inc
meta/recipes-core/util-linux/util-linux.inc disk partitioning, kernel message management,
Quoted 4 lines
index
4031c586c9..bb93eb67d6100644meta/recipes-core/util-linux/util-linux.inc +0
-0@@ -7,11 +7,11 @@ disk partitioning, kernel message management,filesystem creation, and system lo
Quoted 14 lines
meta/recipes-core/util-linux/util-linux.inc disk partitioning, kernel message management, filesystem creation, and system lo · line 14
Quoted 12 lines
SECTION = "base"
LICENSE = "GPLv2+ & LGPLv2.1+ & BSD-3-Clause & BSD-4-Clause"meta/recipes-core/util-linux/util-linux.inc +5
-5-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-uuidshows 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?
Quoted 4 lines
Quoted 1 line
It may fix libuuid but I think it will break libblkid and the others.
AFAICT, it looks correct when I try
bitbake -e util-linuxandbitbake -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.
Quoted 5 lines
Quoted 3 lines
Cheers,
Richard
//Peter
//Peter