<div dir="ltr">Merged into my staging branch this morning, thanks.<div><br></div><div>Ross</div></div><div class="gmail_extra"><br><div class="gmail_quote">On 17 July 2017 at 18:10, Martin Kelly <span dir="ltr"><<a href="mailto:mkelly@xevo.com" target="_blank">mkelly@xevo.com</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">(ping)<div class="HOEnZb"><div class="h5"><br>
<br>
On 07/10/2017 03:18 PM, Martin Kelly wrote:<br>
<blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
The CDDL license is now used by open-vm-tools in meta-openembedded, so<br>
we need to add it in order to prevent warnings.<br>
<br>
Signed-off-by: Martin Kelly <<a href="mailto:mkelly@xevo.com" target="_blank">mkelly@xevo.com</a>><br>
---<br>
meta/conf/licenses.conf | 4 ++++<br>
1 file changed, 4 insertions(+)<br>
<br>
diff --git a/meta/conf/licenses.conf b/meta/conf/licenses.conf<br>
index d210a0e940..3e2d2589ab 100644<br>
--- a/meta/conf/licenses.conf<br>
+++ b/meta/conf/licenses.conf<br>
@@ -105,6 +105,10 @@ SPDXLICENSEMAP[AFL-1] = "AFL-1.2"<br>
SPDXLICENSEMAP[AFLv2] = "AFL-2.0"<br>
SPDXLICENSEMAP[AFLv1] = "AFL-1.2"<br>
<br>
+#CDDL variations<br>
+SPDXLICENSEMAP[CDDLv1] = "CDDL-1.0"<br>
+SPDXLICENSEMAP[CDDL-1] = "CDDL-1.0"<br>
+<br>
#Other variations<br>
SPDXLICENSEMAP[EPLv1.0] = "EPL-1.0"<br>
<br>
<br>
</blockquote>
</div></div></blockquote></div><br></div>