summaryrefslogtreecommitdiffstats
path: root/meta/conf/licenses.conf
diff options
context:
space:
mode:
authorMartin Kelly <mkelly@xevo.com>2017-07-10 15:18:33 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-07-21 22:51:37 +0100
commitc8b91f665b439126c98771e50dfa5c354c5959db (patch)
tree661edc403bdc20ee16b81223342698bfdd62b51e /meta/conf/licenses.conf
parent225b8094568f70937a8fdbf0502270621c2ad251 (diff)
downloadpoky-c8b91f665b439126c98771e50dfa5c354c5959db.tar.gz
licenses.conf: enable CDDLv1 license
The CDDL license is now used by open-vm-tools in meta-openembedded, so we need to add it in order to prevent warnings. (From OE-Core rev: 0dd9db29e56c75181219bb0dbac88a91989b702b) Signed-off-by: Martin Kelly <mkelly@xevo.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/conf/licenses.conf')
-rw-r--r--meta/conf/licenses.conf4
1 files changed, 4 insertions, 0 deletions
diff --git a/meta/conf/licenses.conf b/meta/conf/licenses.conf
index d210a0e940..3e2d2589ab 100644
--- a/meta/conf/licenses.conf
+++ b/meta/conf/licenses.conf
@@ -105,6 +105,10 @@ SPDXLICENSEMAP[AFL-1] = "AFL-1.2"
105SPDXLICENSEMAP[AFLv2] = "AFL-2.0" 105SPDXLICENSEMAP[AFLv2] = "AFL-2.0"
106SPDXLICENSEMAP[AFLv1] = "AFL-1.2" 106SPDXLICENSEMAP[AFLv1] = "AFL-1.2"
107 107
108#CDDL variations
109SPDXLICENSEMAP[CDDLv1] = "CDDL-1.0"
110SPDXLICENSEMAP[CDDL-1] = "CDDL-1.0"
111
108#Other variations 112#Other variations
109SPDXLICENSEMAP[EPLv1.0] = "EPL-1.0" 113SPDXLICENSEMAP[EPLv1.0] = "EPL-1.0"
110 114