aboutsummaryrefslogtreecommitdiffstats
path: root/meta/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:45:19 +0100
commit0dd9db29e56c75181219bb0dbac88a91989b702b (patch)
tree1062f24396eaca281fdbd652a6e6df93532afc77 /meta/conf
parenta0f6508847a28a78cb0a1e9613b6e5cc3047d995 (diff)
downloadopenembedded-core-contrib-0dd9db29e56c75181219bb0dbac88a91989b702b.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. Signed-off-by: Martin Kelly <mkelly@xevo.com> Signed-off-by: Ross Burton <ross.burton@intel.com>
Diffstat (limited to 'meta/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"
SPDXLICENSEMAP[AFLv2] = "AFL-2.0"
SPDXLICENSEMAP[AFLv1] = "AFL-1.2"
+#CDDL variations
+SPDXLICENSEMAP[CDDLv1] = "CDDL-1.0"
+SPDXLICENSEMAP[CDDL-1] = "CDDL-1.0"
+
#Other variations
SPDXLICENSEMAP[EPLv1.0] = "EPL-1.0"