summaryrefslogtreecommitdiffstats
path: root/meta/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-09-30 15:01:51 +0100
commit4b956d1b64f07be79edfa8d1e3ee26a7810144a2 (patch)
tree1c0d1133221335e2eea052c205ebf9bc2e1a3afa /meta/conf
parentba5349dd01a2afe4434c8c2af9bffd5bc4c9ea78 (diff)
downloadpoky-4b956d1b64f07be79edfa8d1e3ee26a7810144a2.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: ef89f176d10ee82738aa050282d93b68dd2c4eb5) Signed-off-by: Mark Jonas <toertel@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
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"
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