Skip to contentSkip to conversation

util-linux: Update License Information (remove GPLv3 Licnese)

PATCH In review Saul Wold 3 participants 4 messages Mar 15, 2013 – Mar 17, 2013

lore
Share & tools
lore

Saul Wold

author
#0 lore raw

PATCH 1/1 util-linux: Update License Information (remove GPLv3 Licnese)

The upstream authors have updated the licenses of a couple subcomponents, these were GPLv3, but updated to be either GPLv2 or LGPLv2.1 accordingly. These changes make the util-linux package become completely non-GPLv3.

Cleaned up some white space issue also

[YOCTO #4014]

---
 meta/recipes-core/util-linux/util-linux.inc        |  2 +-
 .../util-linux/util-linux/mbsalign-license.patch   | 78 ++++++++++++++++++++++
 meta/recipes-core/util-linux/util-linux_2.22.2.bb  | 32 +--------
 3 files changed, 82 insertions(+), 30 deletions(-)
 create mode 100644 meta/recipes-core/util-linux/util-linux/mbsalign-license.patch
meta/recipes-core/util-linux/util-linux.inc +1 -1
index 149cdc5..ecc0c26 100644
@@ -7,7 +7,7 @@ SECTION = "base"
 
 LICENSE = "GPLv2+ & LGPLv2.1+ & BSD"
 
-LIC_FILES_CHKSUM = "file://README.licensing;md5=9c920d811858a74b67a36ba23cbaa95f \
+LIC_FILES_CHKSUM = "file://README.licensing;md5=679af3e410ee112a5ec94de6501bf5c3 \
                     file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
                     file://Documentation/licenses/COPYING.GPLv2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
                     file://Documentation/licenses/COPYING.LGPLv2.1;md5=4fbd65380cdd255951079008b364516c \
meta/recipes-core/util-linux/util-linux/mbsalign-license.patch new file +78 -0

78 lines not on this page · raw message

meta/recipes-core/util-linux/util-linux_2.22.2.bb +3 -29
index 2f48e0b..9b94a47 100644
@@ -2,42 +2,16 @@ MAJOR_VERSION = "2.22"
 PR = "r2"
 require util-linux.inc
 
-# note that `lscpu' is under GPLv3+
-LICENSE_${PN}-lscpu = "GPLv3+"
-
 SRC_URI += "file://util-linux-ng-replace-siginterrupt.patch \
             file://util-linux-ng-2.16-mount_lock_path.patch \
             file://uclibc-__progname-conflict.patch \
-	    file://configure-sbindir.patch \
-	    file://fix-configure.patch \
+            file://configure-sbindir.patch \
+            file://fix-configure.patch \
+            file://mbsalign-license.patch \
 "
 
 SRC_URI[md5sum] = "3e379b4d8b9693948d751c154614c73e"
 SRC_URI[sha256sum] = "7463a17a01a77cee36d8ce845d8148208f553c9abdd67b446324bf42968bc36d"
 
-# Only lscpu part is gplv3; rest of the code is not, 
-# so take out the lscpu parts while running non-gplv3 build.
-# The removal of the package should now occur during
-# the build if INCOMPATIBLE_LICENSE is set to GPLv3
-
-python () {
-    d.setVar("REMOVELSCPU", "no")
-    if (d.getVar("INCOMPATIBLE_LICENSE", True) or "").find("GPLv3") != -1:
-        # avoid GPLv3
-        d.setVar("REMOVELSCPU", "yes")
-        src_uri = (d.getVar("SRC_URI", False) or "").split()
-        src_uri.append("file://remove-lscpu.patch")
-        d.setVar("SRC_URI", " ".join(src_uri))
-}       
-
-do_remove_lscpu() {
-    if [ "x${REMOVELSCPU}" = "xyes" ]; then
-         rm -f sys-utils/lscpu.c sys-utils/lscpu.1
-         rm -rf tests/ts/lscpu tests/expected/lscpu
-    fi
-}
-
-addtask remove_lscpu before do_configure after do_patch
-
 CACHED_CONFIGUREVARS += "scanf_cv_alloc_modifier=as"
 EXTRA_OECONF_class-native += "--disable-fallocate --disable-use-tty-group"
Signature · 1 line
1.8.0.2
#1 lore raw
Quoted 3 lines · Saul Wold

The upstream authors have updated the licenses of a couple subcomponents, these were GPLv3, but updated to be either GPLv2 or LGPLv2.1 accordingly. These changes make the util-linux package become completely non-GPLv3.

Is it possible to demote license from V3 to V2 like that I wonder

#2 lore raw
Quoted 7 lines · Khem Raj
Quoted 3 lines · Saul Wold

The upstream authors have updated the licenses of a couple subcomponents, these were GPLv3, but updated to be either GPLv2 or LGPLv2.1 accordingly. These changes make the util-linux package become completely non-GPLv3.

Is it possible to demote license from V3 to V2 like that I wonder

The maintainer sought out approval from the copyright holders so yes. The more people who've changed the files in question, the harder it becomes.

Cheers,

Richard

#3 lore raw
Quoted 7 lines · Richard Purdie
Quoted 6 lines · Khem Raj
Quoted 3 lines · Saul Wold

The upstream authors have updated the licenses of a couple subcomponents, these were GPLv3, but updated to be either GPLv2 or LGPLv2.1 accordingly. These changes make the util-linux package become completely non-GPLv3.

Quoted 5 lines
Quoted 1 line

Is it possible to demote license from V3 to V2 like that I wonder

The maintainer sought out approval from the copyright holders so yes. The more people who've changed the files in question, the harder it becomes.

OK that makes sense.

Quoted 5 lines

Cheers,

Richard