summaryrefslogtreecommitdiffstats
path: root/meta/recipes-core
diff options
context:
space:
mode:
authorSaul Wold <sgw@linux.intel.com>2013-03-15 12:54:40 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-03-16 17:53:59 +0000
commit2381e46e77c8d33472f60861f66e44addd53af68 (patch)
tree06a9b1c271a585df72e6f3ed56822d4f29714cd4 /meta/recipes-core
parenta6e575292f5e84344bcc2f38ff1f09d9087d25eb (diff)
downloadpoky-2381e46e77c8d33472f60861f66e44addd53af68.tar.gz
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] (From OE-Core rev: 6093fe2694ac5300feaa38fe2eb898ea843f92ee) Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core')
-rw-r--r--meta/recipes-core/util-linux/util-linux.inc2
-rw-r--r--meta/recipes-core/util-linux/util-linux/mbsalign-license.patch78
-rw-r--r--meta/recipes-core/util-linux/util-linux_2.22.2.bb32
3 files changed, 82 insertions, 30 deletions
diff --git a/meta/recipes-core/util-linux/util-linux.inc b/meta/recipes-core/util-linux/util-linux.inc
index 1cb4f5fb2c..41a5471132 100644
--- a/meta/recipes-core/util-linux/util-linux.inc
+++ b/meta/recipes-core/util-linux/util-linux.inc
@@ -7,7 +7,7 @@ SECTION = "base"
7 7
8LICENSE = "GPLv2+ & LGPLv2.1+ & BSD" 8LICENSE = "GPLv2+ & LGPLv2.1+ & BSD"
9 9
10LIC_FILES_CHKSUM = "file://README.licensing;md5=9c920d811858a74b67a36ba23cbaa95f \ 10LIC_FILES_CHKSUM = "file://README.licensing;md5=679af3e410ee112a5ec94de6501bf5c3 \
11 file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ 11 file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
12 file://Documentation/licenses/COPYING.GPLv2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ 12 file://Documentation/licenses/COPYING.GPLv2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
13 file://Documentation/licenses/COPYING.LGPLv2.1;md5=4fbd65380cdd255951079008b364516c \ 13 file://Documentation/licenses/COPYING.LGPLv2.1;md5=4fbd65380cdd255951079008b364516c \
diff --git a/meta/recipes-core/util-linux/util-linux/mbsalign-license.patch b/meta/recipes-core/util-linux/util-linux/mbsalign-license.patch
new file mode 100644
index 0000000000..b2c3652088
--- /dev/null
+++ b/meta/recipes-core/util-linux/util-linux/mbsalign-license.patch
@@ -0,0 +1,78 @@
1
2Upstream-Status: Backport
3Signed-off-by: Saul Wold <sgw@linux.intel.com>
4
5Notes from Pdraig (via email) :
6
7Actually LGPLv2+ is most appropriate for that.
8The intent is that it's licensed under the LGPL anyway:
9
10$ gnulib/gnulib-tool --local-dir gl --extract-license mbsalign
11LGPL
12
13When extracting this to util-linux I should have adjusted
14the boilerplate default license in the file (which gnulib-tool
15can do on import).
16
17
18From 16d8546964db1f6a27ae0f1d1cd24ce42704111d Mon Sep 17 00:00:00 2001
19From: =?UTF-8?q?P=C3=A1draig=20Brady?= <P@draigBrady.com>
20Date: Fri, 15 Mar 2013 09:48:37 +0000
21Subject: [PATCH] lib/mbsalign: correct license header from GPLv[23] to
22 LGPLv2+
23
24* lib/mbsalign.c: s/GPLv3/LGPLv2+/
25* include/mbsalign.h: s/GPLv2/LGPLv2+/
26* README.licensing: Remove mention GPLv3 as it's not actually used.
27---
28 README.licensing | 2 --
29 include/mbsalign.h | 4 ++--
30 lib/mbsalign.c | 4 ++--
31 3 files changed, 4 insertions(+), 6 deletions(-)
32
33diff --git a/README.licensing b/README.licensing
34index b29883c..ab60004 100644
35--- a/README.licensing
36+++ b/README.licensing
37@@ -2,8 +2,6 @@
38 The project util-linux doesn't use the same license for all of the code.
39 There is code under:
40
41- * GPLv3+ (GNU General Public License version 3, or any later version)
42-
43 * GPLv2+ (GNU General Public License version 2, or any later version)
44
45 * GPLv2 (GNU General Public License version 2)
46diff --git a/include/mbsalign.h b/include/mbsalign.h
47index fd957b3..8c9f2db 100644
48--- a/include/mbsalign.h
49+++ b/include/mbsalign.h
50@@ -2,8 +2,8 @@
51 Copyright (C) 2009-2010 Free Software Foundation, Inc.
52
53 This program is free software: you can redistribute it and/or modify
54- it under the terms of the GNU General Public License as published by
55- the Free Software Foundation, either version 2 of the License, or
56+ it under the terms of the GNU Lesser General Public License as published by
57+ the Free Software Foundation, either version 2.1 of the License, or
58 (at your option) any later version.
59
60 This program is distributed in the hope that it will be useful,
61diff --git a/lib/mbsalign.c b/lib/mbsalign.c
62index d97bbd5..05c4650 100644
63--- a/lib/mbsalign.c
64+++ b/lib/mbsalign.c
65@@ -2,8 +2,8 @@
66 Copyright (C) 2009-2010 Free Software Foundation, Inc.
67
68 This program is free software: you can redistribute it and/or modify
69- it under the terms of the GNU General Public License as published by
70- the Free Software Foundation, either version 3 of the License, or
71+ it under the terms of the GNU Lesser General Public License as published by
72+ the Free Software Foundation, either version 2.1 of the License, or
73 (at your option) any later version.
74
75 This program is distributed in the hope that it will be useful,
76--
771.7.7.6
78
diff --git a/meta/recipes-core/util-linux/util-linux_2.22.2.bb b/meta/recipes-core/util-linux/util-linux_2.22.2.bb
index 2f48e0b860..9b94a4773d 100644
--- a/meta/recipes-core/util-linux/util-linux_2.22.2.bb
+++ b/meta/recipes-core/util-linux/util-linux_2.22.2.bb
@@ -2,42 +2,16 @@ MAJOR_VERSION = "2.22"
2PR = "r2" 2PR = "r2"
3require util-linux.inc 3require util-linux.inc
4 4
5# note that `lscpu' is under GPLv3+
6LICENSE_${PN}-lscpu = "GPLv3+"
7
8SRC_URI += "file://util-linux-ng-replace-siginterrupt.patch \ 5SRC_URI += "file://util-linux-ng-replace-siginterrupt.patch \
9 file://util-linux-ng-2.16-mount_lock_path.patch \ 6 file://util-linux-ng-2.16-mount_lock_path.patch \
10 file://uclibc-__progname-conflict.patch \ 7 file://uclibc-__progname-conflict.patch \
11 file://configure-sbindir.patch \ 8 file://configure-sbindir.patch \
12 file://fix-configure.patch \ 9 file://fix-configure.patch \
10 file://mbsalign-license.patch \
13" 11"
14 12
15SRC_URI[md5sum] = "3e379b4d8b9693948d751c154614c73e" 13SRC_URI[md5sum] = "3e379b4d8b9693948d751c154614c73e"
16SRC_URI[sha256sum] = "7463a17a01a77cee36d8ce845d8148208f553c9abdd67b446324bf42968bc36d" 14SRC_URI[sha256sum] = "7463a17a01a77cee36d8ce845d8148208f553c9abdd67b446324bf42968bc36d"
17 15
18# Only lscpu part is gplv3; rest of the code is not,
19# so take out the lscpu parts while running non-gplv3 build.
20# The removal of the package should now occur during
21# the build if INCOMPATIBLE_LICENSE is set to GPLv3
22
23python () {
24 d.setVar("REMOVELSCPU", "no")
25 if (d.getVar("INCOMPATIBLE_LICENSE", True) or "").find("GPLv3") != -1:
26 # avoid GPLv3
27 d.setVar("REMOVELSCPU", "yes")
28 src_uri = (d.getVar("SRC_URI", False) or "").split()
29 src_uri.append("file://remove-lscpu.patch")
30 d.setVar("SRC_URI", " ".join(src_uri))
31}
32
33do_remove_lscpu() {
34 if [ "x${REMOVELSCPU}" = "xyes" ]; then
35 rm -f sys-utils/lscpu.c sys-utils/lscpu.1
36 rm -rf tests/ts/lscpu tests/expected/lscpu
37 fi
38}
39
40addtask remove_lscpu before do_configure after do_patch
41
42CACHED_CONFIGUREVARS += "scanf_cv_alloc_modifier=as" 16CACHED_CONFIGUREVARS += "scanf_cv_alloc_modifier=as"
43EXTRA_OECONF_class-native += "--disable-fallocate --disable-use-tty-group" 17EXTRA_OECONF_class-native += "--disable-fallocate --disable-use-tty-group"