Skip to contentSkip to conversation

Various license clarifications

PATCH Applied Joshua Lock 4 participants 16 messages Dec 15, 2011 – Dec 21, 2011

lore
Share & tools
lore

Joshua Lock

author
#0 lore raw

cover Various license clarifications

A few metadata massages to ensure LICENSE fields specify the correct license version.

The following changes since commit 0eb139619301d0efee330932eba3617dcb39284e:

Patch Upstream Status Updates (2011-12-15 14:35:27 +0000)

are available in the git repository at:
git://git.openembedded.org/openembedded-core-contrib josh/updates
http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=josh/updates

Joshua Lock (10):
gypsy: fix LICENSE field
udev: fix LICENSE fields to be SPDX compliant
apt: clarify LICENSE as GPL-2.0
dpkg: clarify LICENSE as GPL-2.0
clutter: clarify LICENSE as LGPL-2.1
cogl: clarify LICENSE as LGPL-2.1 and fix metadata
matchbox-wm: clarify LICENSE as GPL-2.0
pango: clarify LICENSE is LGPL-2.0+
matchbox-desktop: clarify LICENSE is GPL-2.0+
matchbox-session-sato: clarify LICENSE in GPL-2.0

 meta/recipes-connectivity/gypsy/gypsy.inc          |    2 +-
 meta/recipes-core/udev/udev-new.inc                |    2 +-
 meta/recipes-core/udev/udev.inc                    |    4 ++--
 meta/recipes-devtools/apt/apt.inc                  |    2 +-
 meta/recipes-devtools/dpkg/dpkg.inc                |    2 +-
 meta/recipes-graphics/clutter/clutter.inc          |    2 +-
 meta/recipes-graphics/clutter/cogl.inc             |    6 +++---
 .../matchbox-wm/matchbox-wm_1.2.bb                 |    2 +-
 meta/recipes-graphics/pango/pango.inc              |    2 +-
 .../matchbox-desktop/matchbox-desktop_0.9.1.bb     |    2 +-
 .../matchbox-desktop/matchbox-desktop_2.0.bb       |    2 +-
 .../matchbox-sato/matchbox-session-sato_0.1.bb     |    2 +-
 12 files changed, 15 insertions(+), 15 deletions(-)
Signature · 1 line
1.7.7.4
author
#1 lore raw

PATCH 1/10 gypsy: fix LICENSE field

Gypsy binaries are Gpl-2.0 and the libraries LGPL-2.0

Signed-off-by Joshua Lock <[email protected]>
---
 meta/recipes-connectivity/gypsy/gypsy.inc |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
meta/recipes-connectivity/gypsy/gypsy.inc +1 -1
index 9b1c97e..c2dead4 100644
@@ -4,7 +4,7 @@ multiple clients to access GPS data from multiple GPS sources \
 concurrently.  Gypsy also hides the details of parsing NMEA from the \
 client applications, passing the data as simple values for the clients \
 to use."
-LICENSE = "GPL"
+LICENSE = "GPL-2.0 & LGPL-2.1"
 SECTION = "x11"
 DEPENDS = "glib-2.0 dbus bluez4 dbus-glib"
Signature · 1 line
1.7.7.4
author
#2 lore raw

PATCH 2/10 udev: fix LICENSE fields to be SPDX compliant

In reply to Joshua Lock

Additionally I'm not sure where the LGPL license came from, the COPYING file and Fedora both say GPL v2 or later so drop the LGPL entry for now.

Signed-off-by Joshua Lock <[email protected]>
---
 meta/recipes-core/udev/udev-new.inc |    2 +-
 meta/recipes-core/udev/udev.inc     |    4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)
meta/recipes-core/udev/udev-new.inc +1 -1
index eac7903..769d54a 100644
@@ -2,7 +2,7 @@ SUMMARY = "/dev/ and hotplug management daemon"
 DESCRIPTION = "udev is a daemon which dynamically creates and removes device nodes from \
 /dev/, handles hotplug events and loads drivers at boot time."
 HOMEPAGE = "http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev.html"
-LICENSE = "GPLv2+ & LGPLv2.1+"
+LICENSE = "GPL-2.0+"
 LICENSE_${PN} = "GPLv2+"
 LICENSE_libudev = "LGPLv2.1+"
 LICENSE_libgudev = "LGPLv2.1+"
meta/recipes-core/udev/udev.inc +2 -2
index d731816..2e501fa 100644
@@ -1,7 +1,7 @@
 SUMMARY = "/dev/ and hotplug management daemon"
 DESCRIPTION = "udev is a program which dynamically creates and removes device nodes from \
 /dev/. It responds to /sbin/hotplug device events and requires a 2.6 kernel."
-LICENSE = "GPL"
+LICENSE = "GPL-2.0+"
 
 SRC_URI += " \
 	   file://udev.rules \

@@ -11,7 +11,7 @@ SRC_URI += " \
 	   file://mount.sh \
 	   file://network.sh \
 	   file://local.rules \
-       file://udev-cache \
+           file://udev-cache \
            file://init"
 
 UDEV_DEVFS_RULES ?= "0"
Signature · 1 line
1.7.7.4
#3 lore raw

Re: [PATCH 02/10] udev: fix LICENSE fields to be SPDX compliant

Review

Quoted 10 lines · Joshua Lock

Additionally I'm not sure where the LGPL license came from, the COPYING file and Fedora both say GPL v2 or later so drop the LGPL entry for now.

Signed-off-by Joshua Lock <[email protected]>
---
 meta/recipes-core/udev/udev-new.inc |    2 +-
 meta/recipes-core/udev/udev.inc     |    4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)
(quoted diff) +0 -0

b/meta/recipes-core/udev/udev-new.inc

meta/recipes-core/udev/udev-new.inc SUMMARY = "/dev/ and hotplug management daemon" · line 2

Quoted 5 lines

index eac7903..769d54a 100644

meta/recipes-core/udev/udev-new.inc +0 -0
@@ -2,7 +2,7 @@ SUMMARY = "/dev/ and hotplug management daemon"
 DESCRIPTION = "udev is a daemon which dynamically creates and removes

device nodes from \

meta/recipes-core/udev/udev-new.inc SUMMARY = "/dev/ and hotplug management daemon" · line 4

Quoted 2 lines
meta/recipes-core/udev/udev-new.inc +0 -0
 /dev/, handles hotplug events and loads drivers at boot time."
 HOMEPAGE = "

http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev.html"

meta/recipes-core/udev/udev-new.inc SUMMARY = "/dev/ and hotplug management daemon"

Quoted 3 lines
meta/recipes-core/udev/udev-new.inc +1 -1
-LICENSE = "GPLv2+ & LGPLv2.1+"
+LICENSE = "GPL-2.0+"
 LICENSE_${PN} = "GPLv2+

Why two notations for Gpl v2 above

Review

Quoted 3 lines
meta/recipes-core/udev/udev-new.inc +0 -0
 LICENSE_libudev = "LGPLv2.1+"
 LICENSE_libgudev = "LGPLv2.1+"
(quoted diff) +0 -0

b/meta/recipes-core/udev/udev.inc

meta/recipes-core/udev/udev.inc line 2

Quoted 6 lines

index d731816..2e501fa 100644

meta/recipes-core/udev/udev.inc +0 -0
@@ -1,7 +1,7 @@
 SUMMARY = "/dev/ and hotplug management daemon"
 DESCRIPTION = "udev is a program which dynamically creates and removes

device nodes from \

meta/recipes-core/udev/udev.inc line 3

Quoted 1 line
meta/recipes-core/udev/udev.inc +0 -0
 /dev/. It responds to /sbin/hotplug device events and requires a 2.6

kernel."

Quoted 23 lines
meta/recipes-core/udev/udev.inc +2 -3
-LICENSE = "GPL"
+LICENSE = "GPL-2.0+"
 
 SRC_URI += " \
          file://udev.rules \

@@ -11,7 +11,7 @@ SRC_URI += " \
          file://mount.sh \
          file://network.sh \
          file://local.rules \
-       file://udev-cache \
+           file://udev-cache \
           file://init"
 
 UDEV_DEVFS_RULES ?= "0"
--

1.7.7.4

_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core

author
#4 lore raw

Re: [PATCH 02/10] udev: fix LICENSE fields to be SPDX compliant

Quoted 6 lines · Khem Raj
Quoted 2 lines · On Thursday, December 15, 2011, Joshua Lock <[email protected]…

Additionally I'm not sure where the LGPL license came from, the COPYING file and Fedora both say GPL v2 or later so drop the LGPL entry for now.

Of course, the LGPL is for libudev!

Quoted 16 lines
Quoted 2 lines
Signed-off-by Joshua Lock <[email protected]

<mailto:[email protected]>>

Review

Quoted 6 lines
---
 meta/recipes-core/udev/udev-new.inc |    2 +-
 meta/recipes-core/udev/udev.inc     |    4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)
(quoted diff) +0 -0

b/meta/recipes-core/udev/udev-new.inc

meta/recipes-core/udev/udev-new.inc SUMMARY = "/dev/ and hotplug management daemon" · line 2

Quoted 5 lines

index eac7903..769d54a 100644

meta/recipes-core/udev/udev-new.inc +0 -0
@@ -2,7 +2,7 @@ SUMMARY = "/dev/ and hotplug management daemon"
 DESCRIPTION = "udev is a daemon which dynamically creates and removes

device nodes from \

Quoted 8 lines

meta/recipes-core/udev/udev-new.inc SUMMARY = "/dev/ and hotplug management daemon" · line 4

Quoted 2 lines
meta/recipes-core/udev/udev-new.inc +0 -0
 /dev/, handles hotplug events and loads drivers at boot time."
 HOMEPAGE =

"http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev.html"

meta/recipes-core/udev/udev-new.inc SUMMARY = "/dev/ and hotplug management daemon"

Quoted 3 lines
meta/recipes-core/udev/udev-new.inc +1 -1
-LICENSE = "GPLv2+ & LGPLv2.1+"
+LICENSE = "GPL-2.0+"
 LICENSE_${PN} = "GPLv2+

Why two notations for Gpl v2 above

Good catch, thanks!

I'll get an updated patch series out.

Cheers,
Joshua

Signature · 3 lines
Joshua Lock
        Yocto Project "Johannes factotum"
        Intel Open Source Technology Centre
author
#5 lore raw

PATCH 3/10 apt: clarify LICENSE as GPL-2.0

In reply to Joshua Lock
Signed-off-by Joshua Lock <[email protected]>
---
 meta/recipes-devtools/apt/apt.inc |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
meta/recipes-devtools/apt/apt.inc +1 -1
index 9d3268d..32e7d2d 100644
@@ -1,5 +1,5 @@
 DESCRIPTION = "Advanced front-end for dpkg."
-LICENSE = "GPL"
+LICENSE = "GPL-2.0"
 SECTION = "base"
 
 SRC_URI = "${DEBIAN_MIRROR}/main/a/apt/apt_${PV}.tar.gz \
Signature · 1 line
1.7.7.4
author
#6 lore raw

PATCH 4/10 dpkg: clarify LICENSE as GPL-2.0

In reply to Joshua Lock
Signed-off-by Joshua Lock <[email protected]>
---
 meta/recipes-devtools/dpkg/dpkg.inc |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
meta/recipes-devtools/dpkg/dpkg.inc +1 -1
index 2aecff5..d8f0fa5 100644
@@ -1,5 +1,5 @@
 DESCRIPTION = "Package maintenance system for Debian."
-LICENSE = "GPL"
+LICENSE = "GPL-2.0"
 SECTION = "base"
 
 INC_PR = "r15"
Signature · 1 line
1.7.7.4
author
#7 lore raw

PATCH 5/10 clutter: clarify LICENSE as LGPL-2.1

In reply to Joshua Lock
Signed-off-by Joshua Lock <[email protected]>
---
 meta/recipes-graphics/clutter/clutter.inc |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
meta/recipes-graphics/clutter/clutter.inc +1 -1
index 24cb30d..9e9c955 100644
@@ -1,6 +1,6 @@
 DESCRIPTION = "Clutter graphics library"
 HOMEPAGE = "http://www.clutter-project.org/"
-LICENSE = "LGPL"
+LICENSE = "LGPL-2.1"
 
 # Internal json-glib was removed in Clutter 1.5.2, cogl was removed in 1.8, atk required since 1.8
 STDDEPENDS = "virtual/libx11 gtk-doc-native pango glib-2.0 libxfixes libxi json-glib cogl atk"
Signature · 1 line
1.7.7.4
author
#8 lore raw

PATCH 6/10 cogl: clarify LICENSE as LGPL-2.1 and fix metadata

In reply to Joshua Lock
Signed-off-by Joshua Lock <[email protected]>
---
 meta/recipes-graphics/clutter/cogl.inc |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)
meta/recipes-graphics/clutter/cogl.inc +3 -3
index 81317c6..beb2854 100644
@@ -1,6 +1,6 @@
-DESCRIPTION = "Clutter graphics library"
-HOMEPAGE = "http://www.clutter-project.org/"
-LICENSE = "LGPL"
+DESCRIPTION = "a modern 3D graphics API with associated utility APIs"
+HOMEPAGE = "http://wiki.clutter-project.org/wiki/Cogl"
+LICENSE = "LGPL-2.1"
 
 STDDEPENDS = "virtual/libx11 gtk-doc-native pango glib-2.0 libxfixes gdk-pixbuf libxi"
 BASE_CONF = "--disable-gtk-doc ${@get_clutter_fpu_setting(bb, d)}"
Signature · 1 line
1.7.7.4
author
#9 lore raw

PATCH 7/10 matchbox-wm: clarify LICENSE as GPL-2.0

In reply to Joshua Lock
Signed-off-by Joshua Lock <[email protected]>
---
 .../matchbox-wm/matchbox-wm_1.2.bb                 |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
meta/recipes-graphics/matchbox-wm/matchbox-wm_1.2.bb +1 -1
index 63829ec..87794c8 100644
@@ -1,6 +1,6 @@
 SECTION = "x11/wm"
 DESCRIPTION = "Matchbox window manager"
-LICENSE = "GPL"
+LICENSE = "GPL-2.0"
 DEPENDS = "libmatchbox virtual/libx11 libxext libxcomposite libxfixes xdamage libxrender startup-notification expat"
 PR = "r4"
Signature · 1 line
1.7.7.4
author
#10 lore raw

PATCH 8/10 pango: clarify LICENSE is LGPL-2.0+

In reply to Joshua Lock
Signed-off-by Joshua Lock <[email protected]>
---
 meta/recipes-graphics/pango/pango.inc |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
meta/recipes-graphics/pango/pango.inc +1 -1
index ff5a73a..922425c 100644
@@ -7,7 +7,7 @@ core of text and font handling for GTK+-2.x."
 HOMEPAGE = "http://www.pango.org/"
 BUGTRACKER = "http://bugzilla.gnome.org"
 SECTION = "libs"
-LICENSE = "LGPL"
+LICENSE = "LGPL-2.0+"
 
 X11DEPENDS = "virtual/libx11 libxft"
 DEPENDS = "glib-2.0 fontconfig freetype zlib virtual/libiconv gtk-doc-native cairo "
Signature · 1 line
1.7.7.4
#11 lore raw

Re: [PATCH 08/10] pango: clarify LICENSE is LGPL-2.0+

Op 16 dec. 2011, om 00:30 heeft Joshua Lock het volgende geschreven:

Quoted 13 lines
Signed-off-by Joshua Lock <[email protected]>

---
meta/recipes-graphics/pango/pango.inc | 2 +-

1 files changed, 1 insertions(+), 1 deletions(-)
meta/recipes-graphics/pango/pango.inc +0 -0
index ff5a73a..922425c 100644
@@ -7,7 +7,7 @@ core of text and font handling for GTK+-2.x."

HOMEPAGE = "http://www.pango.org/"
BUGTRACKER = "http://bugzilla.gnome.org"
SECTION = "libs"

meta/recipes-graphics/pango/pango.inc core of text and font handling for GTK+-2.x." · line 10

Quoted 2 lines
meta/recipes-graphics/pango/pango.inc +1 -1
-LICENSE = "LGPL"
+LICENSE = "LGPL-2.0+"

In the past we agreed to use LGLPv2+ for that, has that changed?

author
#12 lore raw

Re: [PATCH 08/10] pango: clarify LICENSE is LGPL-2.0+

Quoted 8 lines · Koen Kooi

Op 16 dec. 2011, om 00:30 heeft Joshua Lock het volgende geschreven:

Quoted 5 lines
Signed-off-by Joshua Lock <[email protected]>

---
meta/recipes-graphics/pango/pango.inc | 2 +-

1 files changed, 1 insertions(+), 1 deletions(-)
Quoted 12 lines

meta/recipes-graphics/pango/pango.inc core of text and font handling for GTK+-2.x." · line 10

Quoted 10 lines
meta/recipes-graphics/pango/pango.inc +0 -0
index ff5a73a..922425c 100644
@@ -7,7 +7,7 @@ core of text and font handling for GTK+-2.x."

HOMEPAGE = "http://www.pango.org/"
BUGTRACKER = "http://bugzilla.gnome.org"
SECTION = "libs"

meta/recipes-graphics/pango/pango.inc +1 -1
-LICENSE = "LGPL"
+LICENSE = "LGPL-2.0+"

In the past we agreed to use LGLPv2+ for that, has that changed?

My bad, I saw the modified license handling code was mapping to SPDX values and opted to just do that. You're right though, current convention is the v notation.

I've respun the patch series.

Cheers,
Joshua

Signature · 3 lines
Joshua Lock
        Yocto Project "Johannes factotum"
        Intel Open Source Technology Centre
author
#13 lore raw

PATCH 9/10 matchbox-desktop: clarify LICENSE is GPL-2.0+

In reply to Joshua Lock
Signed-off-by Joshua Lock <[email protected]>
---
 .../matchbox-desktop/matchbox-desktop_0.9.1.bb     |    2 +-
 .../matchbox-desktop/matchbox-desktop_2.0.bb       |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
meta/recipes-sato/matchbox-desktop/matchbox-desktop_0.9.1.bb +1 -1
index 0a02bb9..d633040 100644
@@ -1,5 +1,5 @@
 DESCRIPTION = "Matchbox Window Manager Desktop"
-LICENSE = "GPL"
+LICENSE = "GPL-2.0+"
 DEPENDS = "libmatchbox startup-notification"
 SECTION = "x11/wm"
meta/recipes-sato/matchbox-desktop/matchbox-desktop_2.0.bb +1 -1
index 2943e4d..f1dde66 100644
@@ -1,5 +1,5 @@
 DESCRIPTION = "Matchbox Window Manager Desktop"
-LICENSE = "GPL"
+LICENSE = "GPL-2.0+"
 DEPENDS = "gtk+ startup-notification"
 SECTION = "x11/wm"
 PR = "r2"
Signature · 1 line
1.7.7.4
author
#14 lore raw

PATCH 10/10 matchbox-session-sato: clarify LICENSE in GPL-2.0

In reply to Joshua Lock
Signed-off-by Joshua Lock <[email protected]>
---
 .../matchbox-sato/matchbox-session-sato_0.1.bb     |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
meta/recipes-sato/matchbox-sato/matchbox-session-sato_0.1.bb +1 -1
index c738584..f463367 100644
@@ -2,7 +2,7 @@ DESCRIPTION = "Custom MB session files for poky"
 HOMEPAGE = "http://www.matchbox-project.org/"
 BUGTRACKER = "http://bugzilla.openedhand.com/"
 
-LICENSE = "GPL"
+LICENSE = "GPL-2.0"
 LIC_FILES_CHKSUM = "file://session;endline=3;md5=f8a5c5b9c279e52dc094d10e11c2be63"
 
 # Distro can override initscripts provider
Signature · 1 line
1.7.7.4
Applied
#15 lore raw
In reply to Joshua Lock
Quoted 11 lines · Joshua Lock

A few metadata massages to ensure LICENSE fields specify the correct license version.

The following changes since commit 0eb139619301d0efee330932eba3617dcb39284e:

Patch Upstream Status Updates (2011-12-15 14:35:27 +0000)

are available in the git repository at:
git://git.openembedded.org/openembedded-core-contrib josh/updates
http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=josh/updates

Quoted 11 lines

Joshua Lock (10):
gypsy: fix LICENSE field
udev: fix LICENSE fields to be SPDX compliant
apt: clarify LICENSE as GPL-2.0
dpkg: clarify LICENSE as GPL-2.0
clutter: clarify LICENSE as LGPL-2.1
cogl: clarify LICENSE as LGPL-2.1 and fix metadata
matchbox-wm: clarify LICENSE as GPL-2.0
pango: clarify LICENSE is LGPL-2.0+
matchbox-desktop: clarify LICENSE is GPL-2.0+
matchbox-session-sato: clarify LICENSE in GPL-2.0

Merged to master, thanks.

Richard