[gnome-continuous-yocto/gnomeostree-3.28-rocko: 6872/8267] licenses.conf: enable CDDLv1 license

[Emmanuele Bassi <ebassi src gnome org>]

commit c8b91f665b439126c98771e50dfa5c354c5959db
Author: Martin Kelly <mkelly xevo com>
Date:   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.
    
    (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>

 meta/conf/licenses.conf |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)
---
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"