Update license file to match current SPDX names
PATCH v6 1/1 Update license file to match current SPDX names
Updated mappings of license fields of meta/conf/licenses.conf to match latest SPDX naming. Added missing mappings.
Renamed license files that were added in license mappings eg from GPL-2.0 to GPL-2.0-only. Added "or later" versions of license mappings
Added "or later" versions of common license files eg GPL-2.0-or-later
---
Changes in V6:
* Added "or later" versions of common license files eg GPL-2.0-or-later in meta/files/common-licenses.
Changes in V5:
* Added "or later" versions of license mappings in meta/conf/licenses.conf
Changes in V4:
* Renamed license files that were added in license mappings eg from GPL-2.0 to GPL-2.0-only
Changes in V3:
* Added missing mappings to meta/conf/licenses.conf
Changes in V2:
* Corrected the email subject line.
meta/conf/licenses.conf | 62 +-
.../{AGPL-3.0 => AGPL-3.0-only} | 0
meta/files/common-licenses/AGPL-3.0-or-later | 613 +++++++++++++++++
.../common-licenses/{GPL-1.0 => GPL-1.0-only} | 0
meta/files/common-licenses/GPL-1.0-or-later | 232 +++++++
.../common-licenses/{GPL-2.0 => GPL-2.0-only} | 0
meta/files/common-licenses/GPL-2.0-or-later | 319 +++++++++
.../common-licenses/{GPL-3.0 => GPL-3.0-only} | 0
meta/files/common-licenses/GPL-3.0-or-later | 625 ++++++++++++++++++
.../{LGPL-2.0 => LGPL-2.0-only} | 0
meta/files/common-licenses/LGPL-2.0-or-later | 446 +++++++++++++
.../{LGPL-2.1 => LGPL-2.1-only} | 0
meta/files/common-licenses/LGPL-2.1-or-later | 468 +++++++++++++
.../{LGPL-3.0 => LGPL-3.0-only} | 0
meta/files/common-licenses/LGPL-3.0-or-later | 163 +++++
15 files changed, 2911 insertions(+), 17 deletions(-)
rename meta/files/common-licenses/{AGPL-3.0 => AGPL-3.0-only} (100%)
create mode 100644 meta/files/common-licenses/AGPL-3.0-or-later
rename meta/files/common-licenses/{GPL-1.0 => GPL-1.0-only} (100%)
create mode 100644 meta/files/common-licenses/GPL-1.0-or-later
rename meta/files/common-licenses/{GPL-2.0 => GPL-2.0-only} (100%)
create mode 100644 meta/files/common-licenses/GPL-2.0-or-later
rename meta/files/common-licenses/{GPL-3.0 => GPL-3.0-only} (100%)
create mode 100644 meta/files/common-licenses/GPL-3.0-or-later
rename meta/files/common-licenses/{LGPL-2.0 => LGPL-2.0-only} (100%)
create mode 100644 meta/files/common-licenses/LGPL-2.0-or-later
rename meta/files/common-licenses/{LGPL-2.1 => LGPL-2.1-only} (100%)
create mode 100644 meta/files/common-licenses/LGPL-2.1-or-later
rename meta/files/common-licenses/{LGPL-3.0 => LGPL-3.0-only} (100%)
create mode 100644 meta/files/common-licenses/LGPL-3.0-or-latermeta/conf/licenses.conf +45 -17
@@ -10,33 +10,51 @@ # Any mapping to MPL/LGPL/GPL should be fixed # AGPL variations -SPDXLICENSEMAP[AGPL-3] = "AGPL-3.0" -SPDXLICENSEMAP[AGPLv3] = "AGPL-3.0" -SPDXLICENSEMAP[AGPLv3.0] = "AGPL-3.0" +SPDXLICENSEMAP[AGPL-3] = "AGPL-3.0-only" +SPDXLICENSEMAP[AGPLv3] = "AGPL-3.0-only" +SPDXLICENSEMAP[AGPLv3.0] = "AGPL-3.0-only" +SPDXLICENSEMAP[AGPL-3.0] = "AGPL-3.0-only" +SPDXLICENSEMAP[AGPL-3.0+] = "AGPL-3.0-or-later" # GPL variations -SPDXLICENSEMAP[GPL-1] = "GPL-1.0" -SPDXLICENSEMAP[GPLv1] = "GPL-1.0" -SPDXLICENSEMAP[GPLv1.0] = "GPL-1.0" -SPDXLICENSEMAP[GPL-2] = "GPL-2.0" -SPDXLICENSEMAP[GPLv2] = "GPL-2.0" -SPDXLICENSEMAP[GPLv2.0] = "GPL-2.0" -SPDXLICENSEMAP[GPL-3] = "GPL-3.0" -SPDXLICENSEMAP[GPLv3] = "GPL-3.0" -SPDXLICENSEMAP[GPLv3.0] = "GPL-3.0" +SPDXLICENSEMAP[GPL-1] = "GPL-1.0-only" +SPDXLICENSEMAP[GPLv1] = "GPL-1.0-only" +SPDXLICENSEMAP[GPLv1.0] = "GPL-1.0-only" +SPDXLICENSEMAP[GPL-1.0+] = "GPL-1.0-or-later" +SPDXLICENSEMAP[GPL-1.0] = "GPL-2.0-only" +SPDXLICENSEMAP[GPL-2] = "GPL-2.0-only" +SPDXLICENSEMAP[GPLv2] = "GPL-2.0-only" +SPDXLICENSEMAP[GPLv2.0] = "GPL-2.0-only" +SPDXLICENSEMAP[GPL-2.0] = "GPL-2.0-only" +SPDXLICENSEMAP[GPL-2.0+] = "GPL-2.0-or-later" +SPDXLICENSEMAP[GPL-3] = "GPL-3.0-only" +SPDXLICENSEMAP[GPLv3] = "GPL-3.0-only" +SPDXLICENSEMAP[GPLv3.0] = "GPL-3.0-only" +SPDXLICENSEMAP[GPL-3.0] = "GPL-3.0-only" +SPDXLICENSEMAP[GPL-3.0+] = "GPL-3.0-or-later" #LGPL variations -SPDXLICENSEMAP[LGPLv2] = "LGPL-2.0" -SPDXLICENSEMAP[LGPLv2.0] = "LGPL-2.0" -SPDXLICENSEMAP[LGPL2.1] = "LGPL-2.1" -SPDXLICENSEMAP[LGPLv2.1] = "LGPL-2.1" -SPDXLICENSEMAP[LGPLv3] = "LGPL-3.0" +SPDXLICENSEMAP[LGPLv2] = "LGPL-2.0-only" +SPDXLICENSEMAP[LGPLv2.0] = "LGPL-2.0-only" +SPDXLICENSEMAP[LGPL-2.0] = "LGPL-2.0-only" +SPDXLICENSEMAP[LGPL-2.0+] = "LGPL-2.0-or-later" +SPDXLICENSEMAP[LGPL2.1] = "LGPL-2.1-only" +SPDXLICENSEMAP[LGPLv2.1] = "LGPL-2.1-only" +SPDXLICENSEMAP[LGPL-2.1] = "LGPL-2.1-only" +SPDXLICENSEMAP[LGPL-2.1+] = "LGPL-2.1-or-later" +SPDXLICENSEMAP[LGPLv3] = "LGPL-3.0-only" +SPDXLICENSEMAP[LGPL-3.0] = "LGPL-3.0-only" +SPDXLICENSEMAP[LGPL-3.0+] = "LGPL-3.0-or-later" #MPL variations SPDXLICENSEMAP[MPL-1] = "MPL-1.0" SPDXLICENSEMAP[MPLv1] = "MPL-1.0" +SPDXLICENSEMAP[MPL-1.0] = "MPL-1.0" SPDXLICENSEMAP[MPLv1.1] = "MPL-1.1" +SPDXLICENSEMAP[MPL-1.1] = "MPL-1.1" SPDXLICENSEMAP[MPLv2] = "MPL-2.0" +SPDXLICENSEMAP[MPL-2.0] = "MPL-2.0" + #MIT variations SPDXLICENSEMAP[MIT-X] = "MIT"
@@ -48,33 +66,43 @@ SPDXLICENSEMAP[openssl] = "OpenSSL" #PSF variations SPDXLICENSEMAP[PSF] = "PSF-2.0" SPDXLICENSEMAP[PSFv2] = "PSF-2.0" +SPDXLICENSEMAP[PSF-2.0] = "PSF-2.0" #Python variations SPDXLICENSEMAP[Python-2] = "Python-2.0" +SPDXLICENSEMAP[Python-2.0] = "Python-2.0" #Apache variations SPDXLICENSEMAP[Apachev2] = "Apache-2.0" SPDXLICENSEMAP[Apache-2] = "Apache-2.0" +SPDXLICENSEMAP[Apache-2.0] = "Apache-2.0" #Artistic variations SPDXLICENSEMAP[Artisticv1] = "Artistic-1.0" SPDXLICENSEMAP[Artistic-1] = "Artistic-1.0" +SPDXLICENSEMAP[Artistic-1.0] = "Artistic-1.0" #Academic variations SPDXLICENSEMAP[AFL-2] = "AFL-2.0" +SPDXLICENSEMAP[AFL-2.0] = "AFL-2.0" SPDXLICENSEMAP[AFL-1] = "AFL-1.2" +SPDXLICENSEMAP[AFL-1.2] = "AFL-1.2" SPDXLICENSEMAP[AFLv2] = "AFL-2.0" +SPDXLICENSEMAP[AFL-2.0] = "AFL-2.0" SPDXLICENSEMAP[AFLv1] = "AFL-1.2" #CDDL variations SPDXLICENSEMAP[CDDLv1] = "CDDL-1.0" SPDXLICENSEMAP[CDDL-1] = "CDDL-1.0" +SPDXLICENSEMAP[CDDL-1.0] = "CDDL-1.0" #Other variations SPDXLICENSEMAP[EPLv1.0] = "EPL-1.0" +SPDXLICENSEMAP[EPL-1.0] = "EPL-1.0" #Silicon Graphics variations SPDXLICENSEMAP[SGIv1] = "SGI-1" +SPDXLICENSEMAP[SGI-1] = "SGI-1" # Additional license directories. Add your custom licenses directories this path. # LICENSE_PATH += "${COREBASE}/custom-licenses"
meta/files/common-licenses/AGPL-3.0-only renamed from meta/files/common-licenses/AGPL-3.0 +0 -0
meta/files/common-licenses/AGPL-3.0-or-later new file +613 -0
613 lines not on this page · raw message
meta/files/common-licenses/GPL-1.0-only renamed from meta/files/common-licenses/GPL-1.0 +0 -0
meta/files/common-licenses/GPL-1.0-or-later new file +232 -0
232 lines not on this page · raw message
meta/files/common-licenses/GPL-2.0-only renamed from meta/files/common-licenses/GPL-2.0 +0 -0
meta/files/common-licenses/GPL-2.0-or-later new file +319 -0
319 lines not on this page · raw message
meta/files/common-licenses/GPL-3.0-only renamed from meta/files/common-licenses/GPL-3.0 +0 -0
meta/files/common-licenses/GPL-3.0-or-later new file +625 -0
625 lines not on this page · raw message
meta/files/common-licenses/LGPL-2.0-only renamed from meta/files/common-licenses/LGPL-2.0 +0 -0
meta/files/common-licenses/LGPL-2.0-or-later new file +446 -0
446 lines not on this page · raw message
meta/files/common-licenses/LGPL-2.1-only renamed from meta/files/common-licenses/LGPL-2.1 +0 -0
meta/files/common-licenses/LGPL-2.1-or-later new file +468 -0
468 lines not on this page · raw message
meta/files/common-licenses/LGPL-3.0-only renamed from meta/files/common-licenses/LGPL-3.0 +0 -0
meta/files/common-licenses/LGPL-3.0-or-later new file +163 -0
163 lines not on this page · raw message
Signature · 1 line
2.17.1
Richard Purdie
AppliedQuoted 9 lines · Meh Mbeh Ida Delphine
Updated mappings of license fields of
meta/conf/licenses.confto match latest SPDX naming. Added missing mappings.
Renamed license files that were added in license mappings eg from GPL-2.0 to GPL-2.0-only. Added "or later" versions of license mappings
Added "or later" versions of common license files eg GPL-2.0-or-laterFixes [YOCTO #13320]Signed-off-by Meh Mbeh Ida Delphine <[email protected]>
I really want to get this issue resolved so I've queued this patch. There is a comment below.
Quoted 14 lines
Changes in V6:
* Added "or later" versions of common license files eg GPL-2.0-or-later in meta/files/common-licenses.Changes in V5:
* Added "or later" versions of license mappings inmeta/conf/licenses.confChanges in V4:
* Renamed license files that were added in license mappings eg from GPL-2.0 to GPL-2.0-onlyChanges in V3:
* Added missing mappings tometa/conf/licenses.confChanges in V2:
* Corrected the email subject line.
[...]
Quoted 51 lines
#MPL variations
SPDXLICENSEMAP[MPL-1] = "MPL-1.0"
SPDXLICENSEMAP[MPLv1] = "MPL-1.0"
+SPDXLICENSEMAP[MPL-1.0] = "MPL-1.0"
SPDXLICENSEMAP[MPLv1.1] = "MPL-1.1"
+SPDXLICENSEMAP[MPL-1.1] = "MPL-1.1"
SPDXLICENSEMAP[MPLv2] = "MPL-2.0"meta/conf/licenses.conf +2
-0+SPDXLICENSEMAP[MPL-2.0] = "MPL-2.0" +#MIT variations
SPDXLICENSEMAP[MIT-X] = "MIT"meta/conf/licenses.conf +0
-0@@ -48,33 +66,43 @@ SPDXLICENSEMAP[openssl] = "OpenSSL" #PSF variationsSPDXLICENSEMAP[PSF] = "PSF-2.0"
SPDXLICENSEMAP[PSFv2] = "PSF-2.0"
+SPDXLICENSEMAP[PSF-2.0] = "PSF-2.0"
#Python variationsSPDXLICENSEMAP[Python-2] = "Python-2.0"
+SPDXLICENSEMAP[Python-2.0] = "Python-2.0"
#Apache variations
SPDXLICENSEMAP[Apachev2] = "Apache-2.0"
SPDXLICENSEMAP[Apache-2] = "Apache-2.0"
+SPDXLICENSEMAP[Apache-2.0] = "Apache-2.0"
#Artistic variations
SPDXLICENSEMAP[Artisticv1] = "Artistic-1.0"
SPDXLICENSEMAP[Artistic-1] = "Artistic-1.0"
+SPDXLICENSEMAP[Artistic-1.0] = "Artistic-1.0"
#Academic variationsSPDXLICENSEMAP[AFL-2] = "AFL-2.0"
+SPDXLICENSEMAP[AFL-2.0] = "AFL-2.0"
SPDXLICENSEMAP[AFL-1] = "AFL-1.2"
+SPDXLICENSEMAP[AFL-1.2] = "AFL-1.2"
SPDXLICENSEMAP[AFLv2] = "AFL-2.0"
+SPDXLICENSEMAP[AFL-2.0] = "AFL-2.0"
SPDXLICENSEMAP[AFLv1] = "AFL-1.2"
#CDDL variations
SPDXLICENSEMAP[CDDLv1] = "CDDL-1.0"
SPDXLICENSEMAP[CDDL-1] = "CDDL-1.0"
+SPDXLICENSEMAP[CDDL-1.0] = "CDDL-1.0"
#Other variations
SPDXLICENSEMAP[EPLv1.0] = "EPL-1.0"
+SPDXLICENSEMAP[EPL-1.0] = "EPL-1.0"
Quoted 4 lines
#Silicon Graphics variations
SPDXLICENSEMAP[SGIv1] = "SGI-1"
+SPDXLICENSEMAP[SGI-1] = "SGI-1"
I removed the above pieces where the piece in [] is the same as the value at the end. We don't need mappings where the two pieces are identical. Everything else in the patch looked ok.
I also realised that we have recipes which reference some of the names which have been renamed in LIC_FILES_CHKSUM entries. The following files look to be affected:
meta/recipes-connectivity/connman/connman-conf.bb meta/recipes-core/busybox/busybox-inittab_1.32.0.bb meta/recipes-core/systemd/systemd-serialgetty.bb meta/recipes-core/sysvinit/sysvinit-inittab_2.88dsf.bb meta/recipes-kernel/make-mod-scripts/make-mod-scripts_1.0.bb
I've queued a patch to fix these.
Cheers,
Richard
Okay. Thanks you.
Cheers,
Ida.
Quoted 112 lines · Richard Purdie,
Quoted 1 line · Meh Mbeh Ida Delphine
Updated mappings of license fields of
meta/conf/licenses.confto matchlatest SPDX naming.
Quoted 2 lines
Added missing mappings.
Renamed license files that were added in license mappings eg fromGPL-2.0 to GPL-2.0-only.
Quoted 6 lines
Added "or later" versions of license mappings
Added "or later" versions of common license files eg GPL-2.0-or-laterFixes [YOCTO #13320]Signed-off-by Meh Mbeh Ida Delphine <[email protected]>I really want to get this issue resolved so I've queued this patch. There is a comment below.
Quoted 2 lines
Changes in V6:
* Added "or later" versions of common license files eg GPL-2.0-or-laterin meta/files/common-licenses.
Quoted 3 lines
Changes in V5:
* Added "or later" versions of license mappings in
meta/conf/licenses.confQuoted 3 lines
Changes in V4:
* Renamed license files that were added in license mappings eg fromGPL-2.0 to GPL-2.0-only
Quoted 6 lines
Changes in V3:
* Added missing mappings tometa/conf/licenses.confChanges in V2:
* Corrected the email subject line.[...]
Quoted 45 lines
#MPL variations
SPDXLICENSEMAP[MPL-1] = "MPL-1.0"
SPDXLICENSEMAP[MPLv1] = "MPL-1.0"meta/conf/licenses.conf +12
-0+SPDXLICENSEMAP[MPL-1.0] = "MPL-1.0" SPDXLICENSEMAP[MPLv1.1] = "MPL-1.1" +SPDXLICENSEMAP[MPL-1.1] = "MPL-1.1" SPDXLICENSEMAP[MPLv2] = "MPL-2.0" +SPDXLICENSEMAP[MPL-2.0] = "MPL-2.0" + #MIT variations SPDXLICENSEMAP[MIT-X] = "MIT"@@ -48,33 +66,43 @@ SPDXLICENSEMAP[openssl] = "OpenSSL" #PSF variations SPDXLICENSEMAP[PSF] = "PSF-2.0" SPDXLICENSEMAP[PSFv2] = "PSF-2.0" +SPDXLICENSEMAP[PSF-2.0] = "PSF-2.0" #Python variations SPDXLICENSEMAP[Python-2] = "Python-2.0" +SPDXLICENSEMAP[Python-2.0] = "Python-2.0" #Apache variations SPDXLICENSEMAP[Apachev2] = "Apache-2.0" SPDXLICENSEMAP[Apache-2] = "Apache-2.0" +SPDXLICENSEMAP[Apache-2.0] = "Apache-2.0" #Artistic variations SPDXLICENSEMAP[Artisticv1] = "Artistic-1.0" SPDXLICENSEMAP[Artistic-1] = "Artistic-1.0" +SPDXLICENSEMAP[Artistic-1.0] = "Artistic-1.0" #Academic variations SPDXLICENSEMAP[AFL-2] = "AFL-2.0" +SPDXLICENSEMAP[AFL-2.0] = "AFL-2.0" SPDXLICENSEMAP[AFL-1] = "AFL-1.2" +SPDXLICENSEMAP[AFL-1.2] = "AFL-1.2" SPDXLICENSEMAP[AFLv2] = "AFL-2.0" +SPDXLICENSEMAP[AFL-2.0] = "AFL-2.0" SPDXLICENSEMAP[AFLv1] = "AFL-1.2" #CDDL variations SPDXLICENSEMAP[CDDLv1] = "CDDL-1.0" SPDXLICENSEMAP[CDDL-1] = "CDDL-1.0" +SPDXLICENSEMAP[CDDL-1.0] = "CDDL-1.0"meta/conf/licenses.conf SPDXLICENSEMAP[openssl] = "OpenSSL" · line 108
Quoted 10 lines
meta/conf/licenses.conf +2
-0#Other variations SPDXLICENSEMAP[EPLv1.0] = "EPL-1.0" +SPDXLICENSEMAP[EPL-1.0] = "EPL-1.0" #Silicon Graphics variations SPDXLICENSEMAP[SGIv1] = "SGI-1" +SPDXLICENSEMAP[SGI-1] = "SGI-1"I removed the above pieces where the piece in [] is the same as the value at the end. We don't need mappings where the two pieces are identical. Everything else in the patch looked ok.
I also realised that we have recipes which reference some of the names which have been renamed in
LIC_FILES_CHKSUMentries. The following files look to be affected:meta/recipes-connectivity/connman/connman-conf.bb meta/recipes-core/busybox/busybox-inittab_1.32.0.bb meta/recipes-core/systemd/systemd-serialgetty.bb meta/recipes-core/sysvinit/sysvinit-inittab_2.88dsf.bb meta/recipes-kernel/make-mod-scripts/make-mod-scripts_1.0.bb
I've queued a patch to fix these.
Cheers,
Richard
this ends with considerable fallout in meta-openembedded
https://errors.yoctoproject.org/Errors/Build/117091/
Quoted 117 lines · Meh Mbeh Ida Delphine
Okay. Thanks you.
Cheers,
Ida.Quoted 107 lines · Richard Purdie,
Quoted 9 lines · Meh Mbeh Ida Delphine
Updated mappings of license fields of
meta/conf/licenses.confto match latest SPDX naming. Added missing mappings.
Renamed license files that were added in license mappings eg from GPL-2.0 to GPL-2.0-only. Added "or later" versions of license mappings
Added "or later" versions of common license files eg GPL-2.0-or-laterFixes [YOCTO #13320]Signed-off-by Meh Mbeh Ida Delphine <[email protected]>I really want to get this issue resolved so I've queued this patch. There is a comment below.
Quoted 14 lines
Changes in V6:
* Added "or later" versions of common license files eg GPL-2.0-or-later in meta/files/common-licenses.Changes in V5:
* Added "or later" versions of license mappings inmeta/conf/licenses.confChanges in V4:
* Renamed license files that were added in license mappings eg from GPL-2.0 to GPL-2.0-onlyChanges in V3:
* Added missing mappings tometa/conf/licenses.confChanges in V2:
* Corrected the email subject line.[...]
Quoted 45 lines
#MPL variations
SPDXLICENSEMAP[MPL-1] = "MPL-1.0"
SPDXLICENSEMAP[MPLv1] = "MPL-1.0"meta/conf/licenses.conf +12
-0+SPDXLICENSEMAP[MPL-1.0] = "MPL-1.0" SPDXLICENSEMAP[MPLv1.1] = "MPL-1.1" +SPDXLICENSEMAP[MPL-1.1] = "MPL-1.1" SPDXLICENSEMAP[MPLv2] = "MPL-2.0" +SPDXLICENSEMAP[MPL-2.0] = "MPL-2.0" + #MIT variations SPDXLICENSEMAP[MIT-X] = "MIT"@@ -48,33 +66,43 @@ SPDXLICENSEMAP[openssl] = "OpenSSL" #PSF variations SPDXLICENSEMAP[PSF] = "PSF-2.0" SPDXLICENSEMAP[PSFv2] = "PSF-2.0" +SPDXLICENSEMAP[PSF-2.0] = "PSF-2.0" #Python variations SPDXLICENSEMAP[Python-2] = "Python-2.0" +SPDXLICENSEMAP[Python-2.0] = "Python-2.0" #Apache variations SPDXLICENSEMAP[Apachev2] = "Apache-2.0" SPDXLICENSEMAP[Apache-2] = "Apache-2.0" +SPDXLICENSEMAP[Apache-2.0] = "Apache-2.0" #Artistic variations SPDXLICENSEMAP[Artisticv1] = "Artistic-1.0" SPDXLICENSEMAP[Artistic-1] = "Artistic-1.0" +SPDXLICENSEMAP[Artistic-1.0] = "Artistic-1.0" #Academic variations SPDXLICENSEMAP[AFL-2] = "AFL-2.0" +SPDXLICENSEMAP[AFL-2.0] = "AFL-2.0" SPDXLICENSEMAP[AFL-1] = "AFL-1.2" +SPDXLICENSEMAP[AFL-1.2] = "AFL-1.2" SPDXLICENSEMAP[AFLv2] = "AFL-2.0" +SPDXLICENSEMAP[AFL-2.0] = "AFL-2.0" SPDXLICENSEMAP[AFLv1] = "AFL-1.2" #CDDL variations SPDXLICENSEMAP[CDDLv1] = "CDDL-1.0" SPDXLICENSEMAP[CDDL-1] = "CDDL-1.0" +SPDXLICENSEMAP[CDDL-1.0] = "CDDL-1.0"meta/conf/licenses.conf SPDXLICENSEMAP[openssl] = "OpenSSL" · line 108
Quoted 10 lines
meta/conf/licenses.conf +2
-0#Other variations SPDXLICENSEMAP[EPLv1.0] = "EPL-1.0" +SPDXLICENSEMAP[EPL-1.0] = "EPL-1.0" #Silicon Graphics variations SPDXLICENSEMAP[SGIv1] = "SGI-1" +SPDXLICENSEMAP[SGI-1] = "SGI-1"I removed the above pieces where the piece in [] is the same as the value at the end. We don't need mappings where the two pieces are identical. Everything else in the patch looked ok.
I also realised that we have recipes which reference some of the names which have been renamed in
LIC_FILES_CHKSUMentries. The following files look to be affected:meta/recipes-connectivity/connman/connman-conf.bb meta/recipes-core/busybox/busybox-inittab_1.32.0.bb meta/recipes-core/systemd/systemd-serialgetty.bb meta/recipes-core/sysvinit/sysvinit-inittab_2.88dsf.bb meta/recipes-kernel/make-mod-scripts/make-mod-scripts_1.0.bb
I've queued a patch to fix these.
Cheers,
Richard
I have cooked a patch for meta-openembedded repos.
Quoted 123 lines · Khem Raj
this ends with considerable fallout in meta-openembedded
https://errors.yoctoproject.org/Errors/Build/117091/
Quoted 117 lines · Meh Mbeh Ida Delphine
Okay. Thanks you.
Cheers,
Ida.Quoted 107 lines · Richard Purdie,
Quoted 9 lines · Meh Mbeh Ida Delphine
Updated mappings of license fields of
meta/conf/licenses.confto match latest SPDX naming. Added missing mappings.
Renamed license files that were added in license mappings eg from GPL-2.0 to GPL-2.0-only. Added "or later" versions of license mappings
Added "or later" versions of common license files eg GPL-2.0-or-laterFixes [YOCTO #13320]Signed-off-by Meh Mbeh Ida Delphine <[email protected]>I really want to get this issue resolved so I've queued this patch. There is a comment below.
Quoted 14 lines
Changes in V6:
* Added "or later" versions of common license files eg GPL-2.0-or-later in meta/files/common-licenses.Changes in V5:
* Added "or later" versions of license mappings inmeta/conf/licenses.confChanges in V4:
* Renamed license files that were added in license mappings eg from GPL-2.0 to GPL-2.0-onlyChanges in V3:
* Added missing mappings tometa/conf/licenses.confChanges in V2:
* Corrected the email subject line.[...]
Quoted 45 lines
#MPL variations
SPDXLICENSEMAP[MPL-1] = "MPL-1.0"
SPDXLICENSEMAP[MPLv1] = "MPL-1.0"meta/conf/licenses.conf +12
-0+SPDXLICENSEMAP[MPL-1.0] = "MPL-1.0" SPDXLICENSEMAP[MPLv1.1] = "MPL-1.1" +SPDXLICENSEMAP[MPL-1.1] = "MPL-1.1" SPDXLICENSEMAP[MPLv2] = "MPL-2.0" +SPDXLICENSEMAP[MPL-2.0] = "MPL-2.0" + #MIT variations SPDXLICENSEMAP[MIT-X] = "MIT"@@ -48,33 +66,43 @@ SPDXLICENSEMAP[openssl] = "OpenSSL" #PSF variations SPDXLICENSEMAP[PSF] = "PSF-2.0" SPDXLICENSEMAP[PSFv2] = "PSF-2.0" +SPDXLICENSEMAP[PSF-2.0] = "PSF-2.0" #Python variations SPDXLICENSEMAP[Python-2] = "Python-2.0" +SPDXLICENSEMAP[Python-2.0] = "Python-2.0" #Apache variations SPDXLICENSEMAP[Apachev2] = "Apache-2.0" SPDXLICENSEMAP[Apache-2] = "Apache-2.0" +SPDXLICENSEMAP[Apache-2.0] = "Apache-2.0" #Artistic variations SPDXLICENSEMAP[Artisticv1] = "Artistic-1.0" SPDXLICENSEMAP[Artistic-1] = "Artistic-1.0" +SPDXLICENSEMAP[Artistic-1.0] = "Artistic-1.0" #Academic variations SPDXLICENSEMAP[AFL-2] = "AFL-2.0" +SPDXLICENSEMAP[AFL-2.0] = "AFL-2.0" SPDXLICENSEMAP[AFL-1] = "AFL-1.2" +SPDXLICENSEMAP[AFL-1.2] = "AFL-1.2" SPDXLICENSEMAP[AFLv2] = "AFL-2.0" +SPDXLICENSEMAP[AFL-2.0] = "AFL-2.0" SPDXLICENSEMAP[AFLv1] = "AFL-1.2" #CDDL variations SPDXLICENSEMAP[CDDLv1] = "CDDL-1.0" SPDXLICENSEMAP[CDDL-1] = "CDDL-1.0" +SPDXLICENSEMAP[CDDL-1.0] = "CDDL-1.0"meta/conf/licenses.conf SPDXLICENSEMAP[openssl] = "OpenSSL" · line 108
Quoted 10 lines
meta/conf/licenses.conf +2
-0#Other variations SPDXLICENSEMAP[EPLv1.0] = "EPL-1.0" +SPDXLICENSEMAP[EPL-1.0] = "EPL-1.0" #Silicon Graphics variations SPDXLICENSEMAP[SGIv1] = "SGI-1" +SPDXLICENSEMAP[SGI-1] = "SGI-1"I removed the above pieces where the piece in [] is the same as the value at the end. We don't need mappings where the two pieces are identical. Everything else in the patch looked ok.
I also realised that we have recipes which reference some of the names which have been renamed in
LIC_FILES_CHKSUMentries. The following files look to be affected:meta/recipes-connectivity/connman/connman-conf.bb meta/recipes-core/busybox/busybox-inittab_1.32.0.bb meta/recipes-core/systemd/systemd-serialgetty.bb meta/recipes-core/sysvinit/sysvinit-inittab_2.88dsf.bb meta/recipes-kernel/make-mod-scripts/make-mod-scripts_1.0.bb
I've queued a patch to fix these.
Cheers,
Richard