Merged into my staging branch this morning, thanks. Ross
On 17 July 2017 at 18:10, Martin Kelly <mke...@xevo.com> wrote: > (ping) > > > On 07/10/2017 03:18 PM, Martin Kelly wrote: > >> 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 <mke...@xevo.com> >> --- >> meta/conf/licenses.conf | 4 ++++ >> 1 file changed, 4 insertions(+) >> >> 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" >> >> >>
-- _______________________________________________ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
