Update license file to match current SPDX names
PATCH v4 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.
---
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 | 55 +++++++++++++------
.../{AGPL-3.0 => AGPL-3.0-only} | 0
.../common-licenses/{GPL-1.0 => GPL-1.0-only} | 0
.../common-licenses/{GPL-2.0 => GPL-2.0-only} | 0
.../common-licenses/{GPL-3.0 => GPL-3.0-only} | 0
.../{LGPL-2.0 => LGPL-2.0-only} | 0
.../{LGPL-2.1 => LGPL-2.1-only} | 0
.../{LGPL-3.0 => LGPL-3.0-only} | 0
8 files changed, 38 insertions(+), 17 deletions(-)
rename meta/files/common-licenses/{AGPL-3.0 => AGPL-3.0-only} (100%)
rename meta/files/common-licenses/{GPL-1.0 => GPL-1.0-only} (100%)
rename meta/files/common-licenses/{GPL-2.0 => GPL-2.0-only} (100%)
rename meta/files/common-licenses/{GPL-3.0 => GPL-3.0-only} (100%)
rename meta/files/common-licenses/{LGPL-2.0 => LGPL-2.0-only} (100%)
rename meta/files/common-licenses/{LGPL-2.1 => LGPL-2.1-only} (100%)
rename meta/files/common-licenses/{LGPL-3.0 => LGPL-3.0-only} (100%)meta/conf/licenses.conf +38 -17
@@ -10,33 +10,44 @@ # 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" # 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-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-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" #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[LGPL2.1] = "LGPL-2.1-only" +SPDXLICENSEMAP[LGPLv2.1] = "LGPL-2.1-only" +SPDXLICENSEMAP[LGPL-2.1] = "LGPL-2.1-only" +SPDXLICENSEMAP[LGPLv3] = "LGPL-3.0-only" +SPDXLICENSEMAP[LGPL-3.0] = "LGPL-3.0-only" #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 +59,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/GPL-1.0-only renamed from meta/files/common-licenses/GPL-1.0 +0 -0
meta/files/common-licenses/GPL-2.0-only renamed from meta/files/common-licenses/GPL-2.0 +0 -0
meta/files/common-licenses/GPL-3.0-only renamed from meta/files/common-licenses/GPL-3.0 +0 -0
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.1-only renamed from meta/files/common-licenses/LGPL-2.1 +0 -0
meta/files/common-licenses/LGPL-3.0-only renamed from meta/files/common-licenses/LGPL-3.0 +0 -0
Signature · 1 line
2.17.1
Quoted 15 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.Fixes [YOCTO #13320]Signed-off-by Meh Mbeh Ida Delphine <[email protected]>---
Changes in V4:
* Renamed license files that were added in license mappings eg from
GPL-2.0 to GPL-2.0-only
Quoted 5 lines
Changes in V3:
* Added missing mappings tometa/conf/licenses.confChanges in V2:
* Corrected the email subject line.
You've sent several versions of this (v5 and v6) however this is the version which is in my view the most correct at the moment. If we do anything with the "or-later" files or variables, it should be in a separate patch to this one.
I did put this patch (the v4) in for testing on the autobuilder. As I suspected and hinted at in the previous email, it failed:
https://autobuilder.yoctoproject.org/typhoon/#/builders/65/builds/2606
(see step1b and the errors).
Basically the issue is references to the license files you (correctly) renamed. We need to update those references. There look to be three problematic references:
step1b: ERROR: sysvinit-inittab-2.88dsf-r10 do_populate_lic: QA Issue: sysvinit-inittab: LIC_FILES_CHKSUM points to an invalid file: /home/pokybuild/yocto-worker/beaglebone/build/meta/files/common-licenses/GPL-2.0 [license-checksum]
step1b: ERROR: sysvinit-inittab-2.88dsf-r10 do_populate_lic: Fatal QA errors found, failing task.
step1b: ERROR: connman-conf-1.0-r2 do_populate_lic: QA Issue: connman-conf: LIC_FILES_CHKSUM points to an invalid file: /home/pokybuild/yocto-worker/beaglebone/build/meta/files/common-licenses/GPL-2.0 [license-checksum]
step1b: ERROR: connman-conf-1.0-r2 do_populate_lic: Fatal QA errors found, failing task.
step1b: ERROR: make-mod-scripts-1.0-r0 do_populate_lic: QA Issue: make-mod-scripts: LIC_FILES_CHKSUM points to an invalid file: /home/pokybuild/yocto-worker/beaglebone/build/meta/files/common-licenses/GPL-2.0 [license-checksum]
step1b: ERROR: make-mod-scripts-1.0-r0 do_populate_lic: Fatal QA errors found, failing task.
Cheers,
Richard
Quoted 7 lines · Richard Purdie
Quoted 5 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.
Is this intended to go into gatesgarth? As we see from the follow-up
fixes: This is an incompatible change at feature freeze time. Asking this because up to this point I was happy that all my layers are working fine on dunfell and master(gatesgarth).
Andreas
Quoted 47 lines
Quoted 10 lines
Fixes [YOCTO #13320]Signed-off-by Meh Mbeh Ida Delphine <[email protected]>---
Changes in V4:
* Renamed license files that were added in license mappings eg from
GPL-2.0 to GPL-2.0-onlyQuoted 5 lines
Changes in V3:
* Added missing mappings tometa/conf/licenses.confChanges in V2:
* Corrected the email subject line.You've sent several versions of this (v5 and v6) however this is the version which is in my view the most correct at the moment. If we do anything with the "or-later" files or variables, it should be in a separate patch to this one.
I did put this patch (the v4) in for testing on the autobuilder. As I suspected and hinted at in the previous email, it failed:
https://autobuilder.yoctoproject.org/typhoon/#/builders/65/builds/2606
(see step1b and the errors).
Basically the issue is references to the license files you (correctly) renamed. We need to update those references. There look to be three problematic references:
step1b: ERROR: sysvinit-inittab-2.88dsf-r10
do_populate_lic: QA Issue: sysvinit-inittab:LIC_FILES_CHKSUMpoints to an invalid file:/home/pokybuild/yocto-worker/beaglebone/build/meta/files/common-licenses/GPL-2.0[license-checksum]
step1b: ERROR: sysvinit-inittab-2.88dsf-r10do_populate_lic: Fatal QA errors found, failing task.
step1b: ERROR: connman-conf-1.0-r2do_populate_lic: QA Issue: connman-conf:LIC_FILES_CHKSUMpoints to an invalid file:/home/pokybuild/yocto-worker/beaglebone/build/meta/files/common-licenses/GPL-2.0[license-checksum]
step1b: ERROR: connman-conf-1.0-r2do_populate_lic: Fatal QA errors found, failing task.
step1b: ERROR: make-mod-scripts-1.0-r0do_populate_lic: QA Issue: make-mod-scripts:LIC_FILES_CHKSUMpoints to an invalid file:/home/pokybuild/yocto-worker/beaglebone/build/meta/files/common-licenses/GPL-2.0[license-checksum]
step1b: ERROR: make-mod-scripts-1.0-r0do_populate_lic: Fatal QA errors found, failing task.Cheers,
Richard
Quoted 8 lines · Andreas Müller
Quoted 6 lines · Richard Purdie
Quoted 5 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.
Quoted 4 lines
Is this intended to go into gatesgarth? As we see from the follow-up
fixes: This is an incompatible change at feature freeze time. Asking this because up to this point I was happy that all my layers are working fine on dunfell and master(gatesgarth).
No, I will hold it until after release at this point, its too late to take a more invasive change like this.
Cheers,
Richard
Quoted 10 lines · Richard Purdie
Quoted 8 lines · Andreas Müller
Quoted 6 lines · Richard Purdie
Quoted 5 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.
Quoted 7 lines
Quoted 4 lines
Is this intended to go into gatesgarth? As we see from the follow-up
fixes: This is an incompatible change at feature freeze time. Asking this because up to this point I was happy that all my layers are working fine on dunfell and master(gatesgarth).No, I will hold it until after release at this point, its too late to take a more invasive change like this.
Thanks!
Andreas
Quoted 5 lines
Cheers,
Richard