[oe-commits] [openembedded-core] 04/25: licenses.conf: enable CDDLv1 license

[git at git.openembedded.org]

This is an automated email from the git hooks/post-receive script.

rpurdie pushed a commit to branch master
in repository openembedded-core.

commit 0dd9db29e56c75181219bb0dbac88a91989b702b
Author: Martin Kelly <mkelly at xevo.com>
AuthorDate: Mon Jul 10 15:18:33 2017 -0700

    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 at xevo.com>
    Signed-off-by: Ross Burton <ross.burton at intel.com>
---
 meta/conf/licenses.conf | 4 ++++
 1 file changed, 4 insertions(+)

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

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.