summaryrefslogtreecommitdiffstats
path: root/meta/conf/licenses.conf
diff options
context:
space:
mode:
authorMark Jonas <toertel@gmail.com>2020-09-29 20:06:59 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2020-11-12 13:07:52 +0000
commit7a7ce159c62fe5a9cf80015f77e3061c00c8cc1c (patch)
treebf1924c5874ef4f24a67ec43a98673b00225b074 /meta/conf/licenses.conf
parenta07f413a83e2ecb216e43b09bac5e5a36370093d (diff)
downloadpoky-7a7ce159c62fe5a9cf80015f77e3061c00c8cc1c.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. (From OE-Core rev: 0898bd34fa79c34704b63d21806d7738af06abb8) 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> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/conf/licenses.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"
45#Openssl variations 45#Openssl variations
46SPDXLICENSEMAP[openssl] = "OpenSSL" 46SPDXLICENSEMAP[openssl] = "OpenSSL"
47 47
48#PSF variations
49SPDXLICENSEMAP[PSF] = "PSF-2.0"
50SPDXLICENSEMAP[PSFv2] = "PSF-2.0"
51
48#Python variations 52#Python variations
49SPDXLICENSEMAP[PSF] = "Python-2.0"
50SPDXLICENSEMAP[PSFv2] = "Python-2.0"
51SPDXLICENSEMAP[Python-2] = "Python-2.0" 53SPDXLICENSEMAP[Python-2] = "Python-2.0"
52 54
53#Apache variations 55#Apache variations