summaryrefslogtreecommitdiffstats
path: root/meta/conf
diff options
context:
space:
mode:
authorMark Jonas <toertel@gmail.com>2020-09-29 20:06:59 +0200
committerSteve Sakoman <steve@sakoman.com>2020-11-05 04:07:15 -1000
commit0898bd34fa79c34704b63d21806d7738af06abb8 (patch)
tree598f8833cfcbe9f1060eee78fbf24cfb861e2cbe /meta/conf
parent9f452e54e94d574f55d40b7e028259c3283bdba8 (diff)
downloadopenembedded-core-contrib-0898bd34fa79c34704b63d21806d7738af06abb8.tar.gz
Map license names PSF and PSFv2 to PSF-2.0
According to SDPX.org "Python License 2.0" is the overall Python license, which is comprised of several licenses. "Python Software Foundation License 2.0" is part of the complete Python license, but is also used independently by some projects. So far the license names PSF and PSFv2 found in LICENSE are mapped to to Python-2.0. This patch maps PSF and PSFv2 to PSF-2.0 und thus corrects the impression that Python-2.0 and PSF-2.0 are synonymous. Signed-off-by: Mark Jonas <toertel@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> (cherry picked from commit ef89f176d10ee82738aa050282d93b68dd2c4eb5) Signed-off-by: Steve Sakoman <steve@sakoman.com>
Diffstat (limited to 'meta/conf')
-rw-r--r--meta/conf/licenses.conf6
1 files changed, 4 insertions, 2 deletions
diff --git a/meta/conf/licenses.conf b/meta/conf/licenses.conf
index 751424d1b6..5b309eb385 100644
--- a/meta/conf/licenses.conf
+++ b/meta/conf/licenses.conf
@@ -45,9 +45,11 @@ SPDXLICENSEMAP[MIT-style] = "MIT"
#Openssl variations
SPDXLICENSEMAP[openssl] = "OpenSSL"
+#PSF variations
+SPDXLICENSEMAP[PSF] = "PSF-2.0"
+SPDXLICENSEMAP[PSFv2] = "PSF-2.0"
+
#Python variations
-SPDXLICENSEMAP[PSF] = "Python-2.0"
-SPDXLICENSEMAP[PSFv2] = "Python-2.0"
SPDXLICENSEMAP[Python-2] = "Python-2.0"
#Apache variations