From: Martin Kelly <mkelly@xevo.com>
Date: Mon, 10 Jul 2017 22:18:33 +0000 (-0700)
Subject: licenses.conf: enable CDDLv1 license
X-Git-Tag: yocto-4.0~16218
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=0dd9db29e56c75181219bb0dbac88a91989b702b;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git

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>
---

diff --git a/meta/conf/licenses.conf b/meta/conf/licenses.conf
index d210a0e940f..3e2d2589ab6 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"