mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-05-08 05:09:24 +00:00
Code Issues Projects Releases Wiki Activity

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

Browse Source 
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]

(From OE-Core rev: 70b758344a0d83fb3eb82ecaffe5f05c7a0579e8)

Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Saul Wold
2013-03-15 12:54:40 -07:00
committed by Richard Purdie
parent b312cc327f
commit 651658eac7
3 changed files with 81 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta/recipes-core/util-linux/util-linux.inc
+1 -1
View File
@@ -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=59530bdf33659b29e73d4adb9f9f6552 \
file://Documentation/licenses/COPYING.GPLv2;md5=8ca43cbc842c2336e835926c2166c28b \
file://Documentation/licenses/COPYING.LGPLv2.1;md5=bbb461211a33b134d42ed5ee802b37ff \
meta/recipes-core/util-linux/util-linux/mbsalign-license.patch
+78
View File
@@ -0,0 +1,78 @@
Upstream-Status: Backport
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Notes from Pdraig (via email) :
Actually LGPLv2+ is most appropriate for that.
The intent is that it's licensed under the LGPL anyway:
$ gnulib/gnulib-tool --local-dir gl --extract-license mbsalign
LGPL
When extracting this to util-linux I should have adjusted
the boilerplate default license in the file (which gnulib-tool
can do on import).
From 16d8546964db1f6a27ae0f1d1cd24ce42704111d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?P=C3=A1draig=20Brady?= <P@draigBrady.com>
Date: Fri, 15 Mar 2013 09:48:37 +0000
Subject: [PATCH] lib/mbsalign: correct license header from GPLv[23] to
LGPLv2+
* lib/mbsalign.c: s/GPLv3/LGPLv2+/
* include/mbsalign.h: s/GPLv2/LGPLv2+/
* README.licensing: Remove mention GPLv3 as it's not actually used.
---
README.licensing | 2 --
include/mbsalign.h | 4 ++--
lib/mbsalign.c | 4 ++--
3 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/README.licensing b/README.licensing
index b29883c..ab60004 100644
--- a/README.licensing
+++ b/README.licensing
@@ -2,8 +2,6 @@
The project util-linux doesn't use the same license for all of the code.
There is code under:
- * GPLv3+ (GNU General Public License version 3, or any later version)
-
* GPLv2+ (GNU General Public License version 2, or any later version)
* GPLv2 (GNU General Public License version 2)
diff --git a/include/mbsalign.h b/include/mbsalign.h
index fd957b3..8c9f2db 100644
--- a/include/mbsalign.h
+++ b/include/mbsalign.h
@@ -2,8 +2,8 @@
Copyright (C) 2009-2010 Free Software Foundation, Inc.
This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation, either version 2 of the License, or
+ it under the terms of the GNU Lesser General Public License as published by
+ the Free Software Foundation, either version 2.1 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
diff --git a/lib/mbsalign.c b/lib/mbsalign.c
index d97bbd5..05c4650 100644
--- a/lib/mbsalign.c
+++ b/lib/mbsalign.c
@@ -2,8 +2,8 @@
Copyright (C) 2009-2010 Free Software Foundation, Inc.
This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation, either version 3 of the License, or
+ it under the terms of the GNU Lesser General Public License as published by
+ the Free Software Foundation, either version 2.1 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
--
1.7.7.6
meta/recipes-core/util-linux/util-linux_2.21.2.bb
+2 -28
View File
@@ -2,41 +2,15 @@ MAJOR_VERSION = "2.21"
PR = "r5"
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://configure-sbindir.patch \
file://mbsalign-license.patch \
"
SRC_URI[md5sum] = "b75b3cfecb943f74338382fde693c2c3"
SRC_URI[sha256sum] = "066f9d8e51bfabd809d266edcd54eefba1cdca57725b95c074fd47fe6fba3d30"
# 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_virtclass-native += "--disable-fallocate --disable-use-tty-group"