From 0898bd34fa79c34704b63d21806d7738af06abb8 Mon Sep 17 00:00:00 2001 From: Mark Jonas Date: Tue, 29 Sep 2020 20:06:59 +0200 Subject: 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 Signed-off-by: Richard Purdie (cherry picked from commit ef89f176d10ee82738aa050282d93b68dd2c4eb5) Signed-off-by: Steve Sakoman --- meta/conf/licenses.conf | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'meta/conf/licenses.conf') 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 -- cgit 1.2.3-korg