summaryrefslogtreecommitdiffstats
path: root/meta/recipes-core
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2011-07-20 23:10:17 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-07-22 11:51:04 +0100
commite3e32fb76e7774b7723321eba5bf4222334b5565 (patch)
treea4cbcc790122a9a7e12b9b11e1373516ae1c5d23 /meta/recipes-core
parent513632070851cbbb7b8998464335b70c119a9351 (diff)
downloadpoky-e3e32fb76e7774b7723321eba5bf4222334b5565.tar.gz
util-linux: Replace sigsetmask with posix compliant functions
This patch is not needed upstream since the code using sigsetmask has been deleted. (From OE-Core rev: 5b43339e2cc7c3f556665260ad7f2a5ee200e0af) Signed-off-by: Khem Raj <raj.khem@gmail.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-2.19.1/remove_sigsetmark.patch35
-rw-r--r--meta/recipes-core/util-linux/util-linux_2.19.1.bb3
2 files changed, 37 insertions, 1 deletions
diff --git a/meta/recipes-core/util-linux/util-linux-2.19.1/remove_sigsetmark.patch b/meta/recipes-core/util-linux/util-linux-2.19.1/remove_sigsetmark.patch
new file mode 100644
index 0000000000..02e4d16ff7
--- /dev/null
+++ b/meta/recipes-core/util-linux/util-linux-2.19.1/remove_sigsetmark.patch
@@ -0,0 +1,35 @@
1simpleinit: remove deprecated sigsetmask()
2
3The sigsetmask() is deprecated in favor of sigprocmask().
4
5This is not needed upstream since simpleinit is removed from
6util-linux-ng master
7
8Signed-off-by: Khem Raj <raj.khem@gmail.com>
9
10Upstream-Status: Inappropriate
11
12Index: util-linux-2.19.1/simpleinit/shutdown.c
13===================================================================
14--- util-linux-2.19.1.orig/simpleinit/shutdown.c 2011-03-04 03:47:47.000000000 -0800
15+++ util-linux-2.19.1/simpleinit/shutdown.c 2011-07-06 08:43:39.183849752 -0700
16@@ -145,7 +145,7 @@
17 {
18 int c, i, fd;
19 char *ptr;
20-
21+ sigset_t sigmask;
22 i = getdtablesize ();
23 for (fd = 3; fd < i; fd++) close (fd);
24 if (getpid () == 1)
25@@ -153,7 +153,9 @@
26 for (fd = 0; fd < 3; fd++) close (fd);
27 while (1) wait (NULL); /* Grim reaper never stops */
28 }
29- sigsetmask (0); /* simpleinit(8) blocks all signals: undo for ALRM */
30+ /* simpleinit(8) blocks all signals: undo for ALRM */
31+ sigemptyset(&sigmask);
32+ sigprocmask (SIG_SETMASK, &sigmask, NULL);
33 for (i = 1; i < NSIG; i++) signal (i, SIG_DFL);
34
35 setlocale(LC_ALL, "");
diff --git a/meta/recipes-core/util-linux/util-linux_2.19.1.bb b/meta/recipes-core/util-linux/util-linux_2.19.1.bb
index 0fd67d11d7..2ef95e6250 100644
--- a/meta/recipes-core/util-linux/util-linux_2.19.1.bb
+++ b/meta/recipes-core/util-linux/util-linux_2.19.1.bb
@@ -1,5 +1,5 @@
1MAJOR_VERSION = "2.19" 1MAJOR_VERSION = "2.19"
2PR = "r2" 2PR = "r3"
3require util-linux.inc 3require util-linux.inc
4 4
5# note that `lscpu' is under GPLv3+ 5# note that `lscpu' is under GPLv3+
@@ -8,6 +8,7 @@ LICENSE_util-linux-lscpu = "GPLv3+"
8SRC_URI += "file://util-linux-ng-replace-siginterrupt.patch \ 8SRC_URI += "file://util-linux-ng-replace-siginterrupt.patch \
9 file://util-linux-ng-2.16-mount_lock_path.patch \ 9 file://util-linux-ng-2.16-mount_lock_path.patch \
10 file://uclibc-__progname-conflict.patch \ 10 file://uclibc-__progname-conflict.patch \
11 file://remove_sigsetmark.patch \
11" 12"
12 13
13SRC_URI[md5sum] = "3eab06f05163dfa65479c44e5231932c" 14SRC_URI[md5sum] = "3eab06f05163dfa65479c44e5231932c"