Update license file to match current SPDX names
PATCH v5 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
Fixes [YOCTO #13320]
Signed-off-by Meh Mbeh Ida Delphine <[email protected]>
---
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
.../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, 45 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 +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/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