Patchwork lttng-ust/lttng-modules: Update LICENSE to reflect MIT

login
register
mail settings
Submitter Richard Purdie
Date Aug. 14, 2014, 10:10 p.m.
Message ID <1408054245.21596.6.camel@ted>
Download mbox | patch
Permalink /patch/78293/
State Accepted
Commit 1a1d641922f6ddb66371fa7a4598c2361aff811c
Headers show

Comments

Richard Purdie - Aug. 14, 2014, 10:10 p.m.
The code in question clearly states MIT is a third license. Update
LICENSE to reflect this (in one case, we did list BSD which is effectively
the same thing but this removes confusion).

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Martin Jansa - Aug. 14, 2014, 10:18 p.m.
On Thu, Aug 14, 2014 at 11:10:45PM +0100, Richard Purdie wrote:
> The code in question clearly states MIT is a third license. Update
> LICENSE to reflect this (in one case, we did list BSD which is effectively
> the same thing but this removes confusion).

Thank you

Acked-by: Martin Jansa <Martin.Jansa@gmail.com>

> 
> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
> 
> diff --git a/meta/recipes-kernel/lttng/lttng-modules_2.5.0.bb b/meta/recipes-kernel/lttng/lttng-modules_2.5.0.bb
> index d873741..9310f0f 100644
> --- a/meta/recipes-kernel/lttng/lttng-modules_2.5.0.bb
> +++ b/meta/recipes-kernel/lttng/lttng-modules_2.5.0.bb
> @@ -1,7 +1,7 @@
>  SECTION = "devel"
>  SUMMARY = "Linux Trace Toolkit KERNEL MODULE"
>  DESCRIPTION = "The lttng-modules 2.0 package contains the kernel tracer modules"
> -LICENSE = "LGPLv2.1 & GPLv2"
> +LICENSE = "LGPLv2.1 & GPLv2 & MIT"
>  LIC_FILES_CHKSUM = "file://LICENSE;md5=1412caf5a1aa90d6a48588a4794c0eac \
>                      file://gpl-2.0.txt;md5=751419260aa954499f7abaabaa882bbe \
>                      file://lgpl-2.1.txt;md5=243b725d71bb5df4a1e5920b344b86ad"
> diff --git a/meta/recipes-kernel/lttng/lttng-ust_2.5.0.bb b/meta/recipes-kernel/lttng/lttng-ust_2.5.0.bb
> index 1595627..1468fc1 100644
> --- a/meta/recipes-kernel/lttng/lttng-ust_2.5.0.bb
> +++ b/meta/recipes-kernel/lttng/lttng-ust_2.5.0.bb
> @@ -3,7 +3,7 @@ DESCRIPTION = "The LTTng UST 2.x package contains the userspace tracer library t
>  HOMEPAGE = "http://lttng.org/ust"
>  BUGTRACKER = "https://bugs.lttng.org/projects/lttng-ust"
>  
> -LICENSE = "LGPLv2.1+ & BSD & GPLv2"
> +LICENSE = "LGPLv2.1+ & MIT & GPLv2"
>  LIC_FILES_CHKSUM = "file://COPYING;md5=c963eb366b781252b0bf0fdf1624d9e9 \
>                      file://snprintf/snprintf.c;endline=32;md5=d3d544959d8a3782b2e07451be0a903c \
>                      file://snprintf/various.h;endline=31;md5=89f2509b6b4682c4fc95255eec4abe44"
> 
> 
> -- 
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core

Patch

diff --git a/meta/recipes-kernel/lttng/lttng-modules_2.5.0.bb b/meta/recipes-kernel/lttng/lttng-modules_2.5.0.bb
index d873741..9310f0f 100644
--- a/meta/recipes-kernel/lttng/lttng-modules_2.5.0.bb
+++ b/meta/recipes-kernel/lttng/lttng-modules_2.5.0.bb
@@ -1,7 +1,7 @@ 
 SECTION = "devel"
 SUMMARY = "Linux Trace Toolkit KERNEL MODULE"
 DESCRIPTION = "The lttng-modules 2.0 package contains the kernel tracer modules"
-LICENSE = "LGPLv2.1 & GPLv2"
+LICENSE = "LGPLv2.1 & GPLv2 & MIT"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=1412caf5a1aa90d6a48588a4794c0eac \
                     file://gpl-2.0.txt;md5=751419260aa954499f7abaabaa882bbe \
                     file://lgpl-2.1.txt;md5=243b725d71bb5df4a1e5920b344b86ad"
diff --git a/meta/recipes-kernel/lttng/lttng-ust_2.5.0.bb b/meta/recipes-kernel/lttng/lttng-ust_2.5.0.bb
index 1595627..1468fc1 100644
--- a/meta/recipes-kernel/lttng/lttng-ust_2.5.0.bb
+++ b/meta/recipes-kernel/lttng/lttng-ust_2.5.0.bb
@@ -3,7 +3,7 @@  DESCRIPTION = "The LTTng UST 2.x package contains the userspace tracer library t
 HOMEPAGE = "http://lttng.org/ust"
 BUGTRACKER = "https://bugs.lttng.org/projects/lttng-ust"
 
-LICENSE = "LGPLv2.1+ & BSD & GPLv2"
+LICENSE = "LGPLv2.1+ & MIT & GPLv2"
 LIC_FILES_CHKSUM = "file://COPYING;md5=c963eb366b781252b0bf0fdf1624d9e9 \
                     file://snprintf/snprintf.c;endline=32;md5=d3d544959d8a3782b2e07451be0a903c \
                     file://snprintf/various.h;endline=31;md5=89f2509b6b4682c4fc95255eec4abe44"