diff options
author | Jason M. Bills <jason.m.bills@intel.com> | 2022-01-06 23:59:39 +0300 |
---|---|---|
committer | Jason M. Bills <jason.m.bills@intel.com> | 2022-01-06 23:59:39 +0300 |
commit | 32777eec25d2c527a62e5ffab90a3dfef35855aa (patch) | |
tree | 588a90a6fe9fb0b35c7ce23ea3bd79fa5151ccde /poky/meta/conf/licenses.conf | |
parent | 61f1ca1b31a9a1108e9e7f71e47fdc19beb0490b (diff) | |
parent | 5cc2f81c5b66da00cad24e18b0d23442af060c3f (diff) | |
download | openbmc-32777eec25d2c527a62e5ffab90a3dfef35855aa.tar.xz |
Merge tag '0.86' of firmware.bmc.openbmc.yocto.openbmc into update
Diffstat (limited to 'poky/meta/conf/licenses.conf')
-rw-r--r-- | poky/meta/conf/licenses.conf | 30 |
1 files changed, 18 insertions, 12 deletions
diff --git a/poky/meta/conf/licenses.conf b/poky/meta/conf/licenses.conf index e2bd58f84..991fb6cc2 100644 --- a/poky/meta/conf/licenses.conf +++ b/poky/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. |