diff options
author | Peter Kjellerstedt <peter.kjellerstedt@axis.com> | 2021-09-03 23:40:14 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-09-04 15:05:39 +0100 |
commit | 35d699c479b6ce6acafbf75fb003618aaad094d7 (patch) | |
tree | f20caa2a92e66abc200faf452d1486f0e4f42422 /meta/conf | |
parent | fff339b5bd7789db5d0c024fc84490ac17fa4fe9 (diff) | |
download | openembedded-core-35d699c479b6ce6acafbf75fb003618aaad094d7.tar.gz |
common-licenses, licenses.conf: Remove duplicate licenses
This removes BSD-0-Clause, Nauman, tcl and vim and adds mappings for
them to their SPDX counterparts (0BSD, Naumen, TCL and Vim).
It also removes FreeType, which already had a mapping to FTL.
Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/conf')
-rw-r--r-- | meta/conf/licenses.conf | 30 |
1 files changed, 18 insertions, 12 deletions
diff --git a/meta/conf/licenses.conf b/meta/conf/licenses.conf index e2bd58f84a..991fb6cc23 100644 --- a/meta/conf/licenses.conf +++ b/meta/conf/licenses.conf @@ -19,6 +19,9 @@ SPDXLICENSEMAP[AGPLv3.0+] = "AGPL-3.0-or-later" SPDXLICENSEMAP[AGPL-3.0] = "AGPL-3.0-only" SPDXLICENSEMAP[AGPL-3.0+] = "AGPL-3.0-or-later" +# BSD variations +SPDXLICENSEMAP[BSD-0-Clause] = "0BSD" + # GPL variations SPDXLICENSEMAP[GPL-1] = "GPL-1.0-only" SPDXLICENSEMAP[GPL-1+] = "GPL-1.0-or-later" @@ -45,7 +48,7 @@ SPDXLICENSEMAP[GPLv3.0+] = "GPL-3.0-or-later" SPDXLICENSEMAP[GPL-3.0] = "GPL-3.0-only" SPDXLICENSEMAP[GPL-3.0+] = "GPL-3.0-or-later" -#LGPL variations +# LGPL variations SPDXLICENSEMAP[LGPLv2] = "LGPL-2.0-only" SPDXLICENSEMAP[LGPLv2+] = "LGPL-2.0-or-later" SPDXLICENSEMAP[LGPLv2.0] = "LGPL-2.0-only" @@ -63,49 +66,52 @@ SPDXLICENSEMAP[LGPLv3+] = "LGPL-3.0-or-later" SPDXLICENSEMAP[LGPL-3.0] = "LGPL-3.0-only" SPDXLICENSEMAP[LGPL-3.0+] = "LGPL-3.0-or-later" -#MPL variations +# MPL variations SPDXLICENSEMAP[MPL-1] = "MPL-1.0" SPDXLICENSEMAP[MPLv1] = "MPL-1.0" SPDXLICENSEMAP[MPLv1.1] = "MPL-1.1" SPDXLICENSEMAP[MPLv2] = "MPL-2.0" -#MIT variations +# MIT variations SPDXLICENSEMAP[MIT-X] = "MIT" SPDXLICENSEMAP[MIT-style] = "MIT" -#Openssl variations +# Openssl variations SPDXLICENSEMAP[openssl] = "OpenSSL" -#PSF variations +# PSF variations SPDXLICENSEMAP[PSF] = "PSF-2.0" SPDXLICENSEMAP[PSFv2] = "PSF-2.0" -#Python variations +# Python variations SPDXLICENSEMAP[Python-2] = "Python-2.0" -#Apache variations +# Apache variations SPDXLICENSEMAP[Apachev2] = "Apache-2.0" SPDXLICENSEMAP[Apache-2] = "Apache-2.0" -#Artistic variations +# Artistic variations SPDXLICENSEMAP[Artisticv1] = "Artistic-1.0" SPDXLICENSEMAP[Artistic-1] = "Artistic-1.0" -#Academic variations +# Academic variations SPDXLICENSEMAP[AFL-2] = "AFL-2.0" SPDXLICENSEMAP[AFL-1] = "AFL-1.2" SPDXLICENSEMAP[AFLv2] = "AFL-2.0" SPDXLICENSEMAP[AFLv1] = "AFL-1.2" -#CDDL variations +# CDDL variations SPDXLICENSEMAP[CDDLv1] = "CDDL-1.0" SPDXLICENSEMAP[CDDL-1] = "CDDL-1.0" -#Other variations +# Other variations SPDXLICENSEMAP[EPLv1.0] = "EPL-1.0" SPDXLICENSEMAP[FreeType] = "FTL" +SPDXLICENSEMAP[Nauman] = "Naumen" +SPDXLICENSEMAP[tcl] = "TCL" +SPDXLICENSEMAP[vim] = "Vim" -#Silicon Graphics variations +# Silicon Graphics variations SPDXLICENSEMAP[SGIv1] = "SGI-1" # Additional license directories. Add your custom licenses directories this path. |