summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSaul Wold <sgw@linux.intel.com>2012-02-27 08:45:48 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-02-28 12:27:46 (GMT)
commit79e8d533eec5dc0b1831bd4c6e4959401c7f1fcb (patch)
tree6253b2390a781ad4e84a50108ca158b553890c4c
parentef461c4a2a3e056adc875662f3c26f2cb4b9f161 (diff)
downloadpoky-79e8d533eec5dc0b1831bd4c6e4959401c7f1fcb.tar.gz
util-linux: Update to 2.21
This updates various checksums for the COPYING files, which moved in the process no changes to Licenses Tweak the scanf_cv_alloc_modifier and rebase the patch (From OE-Core rev: 9cb35b41c803bd0d1904b2dc0e14624fa7ea6e95) Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-core/util-linux/util-linux-2.20.1/util-linux-ng-replace-siginterrupt.patch25
-rw-r--r--meta/recipes-core/util-linux/util-linux-2.21/MCONFIG (renamed from meta/recipes-core/util-linux/util-linux-2.20.1/MCONFIG)0
-rw-r--r--meta/recipes-core/util-linux/util-linux-2.21/defines.h (renamed from meta/recipes-core/util-linux/util-linux-2.20.1/defines.h)0
-rw-r--r--meta/recipes-core/util-linux/util-linux-2.21/make_include (renamed from meta/recipes-core/util-linux/util-linux-2.20.1/make_include)0
-rw-r--r--meta/recipes-core/util-linux/util-linux-2.21/remove-lscpu.patch (renamed from meta/recipes-core/util-linux/util-linux-2.20.1/remove-lscpu.patch)0
-rw-r--r--meta/recipes-core/util-linux/util-linux-2.21/remove_sigsetmark.patch (renamed from meta/recipes-core/util-linux/util-linux-2.20.1/remove_sigsetmark.patch)0
-rw-r--r--meta/recipes-core/util-linux/util-linux-2.21/swapargs.h (renamed from meta/recipes-core/util-linux/util-linux-2.20.1/swapargs.h)0
-rw-r--r--meta/recipes-core/util-linux/util-linux-2.21/uclibc-__progname-conflict.patch (renamed from meta/recipes-core/util-linux/util-linux-2.20.1/uclibc-__progname-conflict.patch)0
-rw-r--r--meta/recipes-core/util-linux/util-linux-2.21/uclibc-compile.patch (renamed from meta/recipes-core/util-linux/util-linux-2.20.1/uclibc-compile.patch)0
-rw-r--r--meta/recipes-core/util-linux/util-linux-2.21/util-linux-ng-2.16-mount_lock_path.patch (renamed from meta/recipes-core/util-linux/util-linux-2.20.1/util-linux-ng-2.16-mount_lock_path.patch)0
-rw-r--r--meta/recipes-core/util-linux/util-linux-2.21/util-linux-ng-replace-siginterrupt.patch26
-rw-r--r--meta/recipes-core/util-linux/util-linux.inc8
-rw-r--r--meta/recipes-core/util-linux/util-linux_2.21.bb (renamed from meta/recipes-core/util-linux/util-linux_2.20.1.bb)12
13 files changed, 37 insertions, 34 deletions
diff --git a/meta/recipes-core/util-linux/util-linux-2.20.1/util-linux-ng-replace-siginterrupt.patch b/meta/recipes-core/util-linux/util-linux-2.20.1/util-linux-ng-replace-siginterrupt.patch
deleted file mode 100644
index c5c0aff..0000000
--- a/meta/recipes-core/util-linux/util-linux-2.20.1/util-linux-ng-replace-siginterrupt.patch
+++ /dev/null
@@ -1,25 +0,0 @@
1Upstream-Status: Pending
2
3Index: util-linux-ng-2.14/login-utils/login.c
4===================================================================
5--- util-linux-ng-2.14.orig/login-utils/login.c 2008-05-28 16:01:02.000000000 -0700
6+++ util-linux-ng-2.14/login-utils/login.c 2009-03-04 18:31:42.000000000 -0800
7@@ -358,6 +358,7 @@
8 char *childArgv[10];
9 char *buff;
10 int childArgc = 0;
11+ struct sigaction act;
12 #ifdef HAVE_SECURITY_PAM_MISC_H
13 int retcode;
14 pam_handle_t *pamh = NULL;
15@@ -373,7 +374,9 @@
16 pid = getpid();
17
18 signal(SIGALRM, timedout);
19- siginterrupt(SIGALRM,1); /* we have to interrupt syscalls like ioclt() */
20+ (void) sigaction(SIGALRM, NULL, &act);
21+ act.sa_flags &= ~SA_RESTART;
22+ sigaction(SIGALRM, &act, NULL);
23 alarm((unsigned int)timeout);
24 signal(SIGQUIT, SIG_IGN);
25 signal(SIGINT, SIG_IGN);
diff --git a/meta/recipes-core/util-linux/util-linux-2.20.1/MCONFIG b/meta/recipes-core/util-linux/util-linux-2.21/MCONFIG
index 3fea2c0..3fea2c0 100644
--- a/meta/recipes-core/util-linux/util-linux-2.20.1/MCONFIG
+++ b/meta/recipes-core/util-linux/util-linux-2.21/MCONFIG
diff --git a/meta/recipes-core/util-linux/util-linux-2.20.1/defines.h b/meta/recipes-core/util-linux/util-linux-2.21/defines.h
index 6ce6b86..6ce6b86 100644
--- a/meta/recipes-core/util-linux/util-linux-2.20.1/defines.h
+++ b/meta/recipes-core/util-linux/util-linux-2.21/defines.h
diff --git a/meta/recipes-core/util-linux/util-linux-2.20.1/make_include b/meta/recipes-core/util-linux/util-linux-2.21/make_include
index e6abcd9..e6abcd9 100644
--- a/meta/recipes-core/util-linux/util-linux-2.20.1/make_include
+++ b/meta/recipes-core/util-linux/util-linux-2.21/make_include
diff --git a/meta/recipes-core/util-linux/util-linux-2.20.1/remove-lscpu.patch b/meta/recipes-core/util-linux/util-linux-2.21/remove-lscpu.patch
index 434e28d..434e28d 100644
--- a/meta/recipes-core/util-linux/util-linux-2.20.1/remove-lscpu.patch
+++ b/meta/recipes-core/util-linux/util-linux-2.21/remove-lscpu.patch
diff --git a/meta/recipes-core/util-linux/util-linux-2.20.1/remove_sigsetmark.patch b/meta/recipes-core/util-linux/util-linux-2.21/remove_sigsetmark.patch
index 02e4d16..02e4d16 100644
--- a/meta/recipes-core/util-linux/util-linux-2.20.1/remove_sigsetmark.patch
+++ b/meta/recipes-core/util-linux/util-linux-2.21/remove_sigsetmark.patch
diff --git a/meta/recipes-core/util-linux/util-linux-2.20.1/swapargs.h b/meta/recipes-core/util-linux/util-linux-2.21/swapargs.h
index e960eef..e960eef 100644
--- a/meta/recipes-core/util-linux/util-linux-2.20.1/swapargs.h
+++ b/meta/recipes-core/util-linux/util-linux-2.21/swapargs.h
diff --git a/meta/recipes-core/util-linux/util-linux-2.20.1/uclibc-__progname-conflict.patch b/meta/recipes-core/util-linux/util-linux-2.21/uclibc-__progname-conflict.patch
index 45826b1..45826b1 100644
--- a/meta/recipes-core/util-linux/util-linux-2.20.1/uclibc-__progname-conflict.patch
+++ b/meta/recipes-core/util-linux/util-linux-2.21/uclibc-__progname-conflict.patch
diff --git a/meta/recipes-core/util-linux/util-linux-2.20.1/uclibc-compile.patch b/meta/recipes-core/util-linux/util-linux-2.21/uclibc-compile.patch
index 75774d8..75774d8 100644
--- a/meta/recipes-core/util-linux/util-linux-2.20.1/uclibc-compile.patch
+++ b/meta/recipes-core/util-linux/util-linux-2.21/uclibc-compile.patch
diff --git a/meta/recipes-core/util-linux/util-linux-2.20.1/util-linux-ng-2.16-mount_lock_path.patch b/meta/recipes-core/util-linux/util-linux-2.21/util-linux-ng-2.16-mount_lock_path.patch
index 5773d7e..5773d7e 100644
--- a/meta/recipes-core/util-linux/util-linux-2.20.1/util-linux-ng-2.16-mount_lock_path.patch
+++ b/meta/recipes-core/util-linux/util-linux-2.21/util-linux-ng-2.16-mount_lock_path.patch
diff --git a/meta/recipes-core/util-linux/util-linux-2.21/util-linux-ng-replace-siginterrupt.patch b/meta/recipes-core/util-linux/util-linux-2.21/util-linux-ng-replace-siginterrupt.patch
new file mode 100644
index 0000000..ef56048
--- /dev/null
+++ b/meta/recipes-core/util-linux/util-linux-2.21/util-linux-ng-replace-siginterrupt.patch
@@ -0,0 +1,26 @@
1Upstream-Status: Pending
2
3Index: util-linux-2.21/login-utils/login.c
4===================================================================
5--- util-linux-2.21.orig/login-utils/login.c
6+++ util-linux-2.21/login-utils/login.c
7@@ -1216,6 +1216,8 @@ int main(int argc, char **argv)
8 char *buff;
9 int childArgc = 0;
10 int retcode;
11+ struct sigaction act;
12+
13
14 char *pwdbuf = NULL;
15 struct passwd *pwd = NULL, _pwd;
16@@ -1229,7 +1231,9 @@ int main(int argc, char **argv)
17 timeout = getlogindefs_num("LOGIN_TIMEOUT", LOGIN_TIMEOUT);
18
19 signal(SIGALRM, timedout);
20- siginterrupt(SIGALRM, 1); /* we have to interrupt syscalls like ioclt() */
21+ (void) sigaction(SIGALRM, NULL, &act);
22+ act.sa_flags &= ~SA_RESTART;
23+ sigaction(SIGALRM, &act, NULL);
24 alarm((unsigned int)timeout);
25 signal(SIGQUIT, SIG_IGN);
26 signal(SIGINT, SIG_IGN);
diff --git a/meta/recipes-core/util-linux/util-linux.inc b/meta/recipes-core/util-linux/util-linux.inc
index f60f33b..1a3d293 100644
--- a/meta/recipes-core/util-linux/util-linux.inc
+++ b/meta/recipes-core/util-linux/util-linux.inc
@@ -9,9 +9,11 @@ LICENSE = "GPLv2+ & LGPLv2.1+ & BSD"
9 9
10LIC_FILES_CHKSUM = "file://README.licensing;md5=9c920d811858a74b67a36ba23cbaa95f \ 10LIC_FILES_CHKSUM = "file://README.licensing;md5=9c920d811858a74b67a36ba23cbaa95f \
11 file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 \ 11 file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 \
12 file://licenses/COPYING.GPL;md5=8ca43cbc842c2336e835926c2166c28b \ 12 file://Documentation/licenses/COPYING.GPLv2;md5=8ca43cbc842c2336e835926c2166c28b \
13 file://licenses/COPYING.UCB;md5=263860f8968d8bafa5392cab74285262 \ 13 file://Documentation/licenses/COPYING.LGPLv2.1;md5=bbb461211a33b134d42ed5ee802b37ff \
14 file://getopt/COPYING;md5=8ca43cbc842c2336e835926c2166c28b" 14 file://Documentation/licenses/COPYING.BSD-3;md5=58dcd8452651fc8b07d1f65ce07ca8af \
15 file://Documentation/licenses/COPYING.UCB;md5=263860f8968d8bafa5392cab74285262 \
16 file://getopt/COPYING;md5=c3a41733416fb80af7ba1b7e1f712551"
15 17
16inherit autotools gettext pkgconfig 18inherit autotools gettext pkgconfig
17DEPENDS = "zlib ncurses" 19DEPENDS = "zlib ncurses"
diff --git a/meta/recipes-core/util-linux/util-linux_2.20.1.bb b/meta/recipes-core/util-linux/util-linux_2.21.bb
index ed445d7..aa6ac64 100644
--- a/meta/recipes-core/util-linux/util-linux_2.20.1.bb
+++ b/meta/recipes-core/util-linux/util-linux_2.21.bb
@@ -1,5 +1,5 @@
1MAJOR_VERSION = "2.20" 1MAJOR_VERSION = "2.21"
2PR = "r2" 2PR = "r0"
3require util-linux.inc 3require util-linux.inc
4 4
5# note that `lscpu' is under GPLv3+ 5# note that `lscpu' is under GPLv3+
@@ -10,15 +10,15 @@ SRC_URI += "file://util-linux-ng-replace-siginterrupt.patch \
10 file://uclibc-__progname-conflict.patch \ 10 file://uclibc-__progname-conflict.patch \
11" 11"
12 12
13SRC_URI[md5sum] = "079b37517fd4e002a2e6e992e8b4e361" 13SRC_URI[md5sum] = "3c7a26963f3921c1e775a80330321870"
14SRC_URI[sha256sum] = "d16ebcda3e64ab88ed363d9c1242cdb7ccfd5e1f56c83d0c3b0638c23793bbe0" 14SRC_URI[sha256sum] = "2813ae6fe0449b60402e122c2baf97f26aa53e6e2dd05591c6cbcdf67ffdb6c6"
15 15
16# Only lscpu part is gplv3; rest of the code is not, 16# Only lscpu part is gplv3; rest of the code is not,
17# so take out the lscpu parts while running non-gplv3 build. 17# so take out the lscpu parts while running non-gplv3 build.
18python () { 18python () {
19 d.setVar("REMOVELSCPU", "no") 19 d.setVar("REMOVELSCPU", "no")
20 if (d.getVar("INCOMPATIBLE_LICENSE", True) or "").find("GPLv3") != -1: 20 if (d.getVar("INCOMPATIBLE_LICENSE", True) or "").find("GPLv3") != -1:
21 # avoid GPLv3 21 # avoid GPLv3
22 d.setVar("REMOVELSCPU", "yes") 22 d.setVar("REMOVELSCPU", "yes")
23 packages = (d.getVar("PACKAGES", False) or "").split() 23 packages = (d.getVar("PACKAGES", False) or "").split()
24 if "util-linux-lscpu" in packages: 24 if "util-linux-lscpu" in packages:
@@ -39,7 +39,7 @@ do_remove_lscpu() {
39 39
40addtask remove_lscpu before do_configure after do_patch 40addtask remove_lscpu before do_configure after do_patch
41 41
42CACHED_CONFIGUREVARS += "scanf_cv_type_modifier=as" 42CACHED_CONFIGUREVARS += "scanf_cv_alloc_modifier=as"
43EXTRA_OECONF_virtclass-native += "--disable-fallocate --disable-use-tty-group" 43EXTRA_OECONF_virtclass-native += "--disable-fallocate --disable-use-tty-group"
44 44
45do_install_append () { 45do_install_append () {