diff options
| author |   Khem Raj <raj.khem@gmail.com> | 2011-07-20 23:10:17 -0700 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-07-22 11:49:54 +0100 |
| commit | 5b43339e2cc7c3f556665260ad7f2a5ee200e0af (patch) | |
| tree | 6b3d50c396277efc00b53b06f5a6c55d08250cf3 | |
| parent | 60d91ffc6367fe11ced5890240c6b65ada66621e (diff) | |
| download | openembedded-core-contrib-5b43339e2cc7c3f556665260ad7f2a5ee200e0af.tar.gz | |
util-linux: Replace sigsetmask with posix compliant functions
This patch is not needed upstream since the code using sigsetmask
has been deleted.
Signed-off-by: Khem Raj <raj.khem@gmail.com>
| -rw-r--r-- | meta/recipes-core/util-linux/util-linux-2.19.1/remove_sigsetmark.patch | 35 | ||||
| -rw-r--r-- | meta/recipes-core/util-linux/util-linux_2.19.1.bb | 3 |
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 00000000000..02e4d16ff7f --- /dev/null +++ b/meta/recipes-core/util-linux/util-linux-2.19.1/remove_sigsetmark.patch @@ -0,0 +1,35 @@ +simpleinit: remove deprecated sigsetmask() + +The sigsetmask() is deprecated in favor of sigprocmask(). + +This is not needed upstream since simpleinit is removed from +util-linux-ng master + +Signed-off-by: Khem Raj <raj.khem@gmail.com> + +Upstream-Status: Inappropriate + +Index: util-linux-2.19.1/simpleinit/shutdown.c +=================================================================== +--- util-linux-2.19.1.orig/simpleinit/shutdown.c 2011-03-04 03:47:47.000000000 -0800 ++++ util-linux-2.19.1/simpleinit/shutdown.c 2011-07-06 08:43:39.183849752 -0700 +@@ -145,7 +145,7 @@ + { + int c, i, fd; + char *ptr; +- ++ sigset_t sigmask; + i = getdtablesize (); + for (fd = 3; fd < i; fd++) close (fd); + if (getpid () == 1) +@@ -153,7 +153,9 @@ + for (fd = 0; fd < 3; fd++) close (fd); + while (1) wait (NULL); /* Grim reaper never stops */ + } +- sigsetmask (0); /* simpleinit(8) blocks all signals: undo for ALRM */ ++ /* simpleinit(8) blocks all signals: undo for ALRM */ ++ sigemptyset(&sigmask); ++ sigprocmask (SIG_SETMASK, &sigmask, NULL); + for (i = 1; i < NSIG; i++) signal (i, SIG_DFL); + + 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 0fd67d11d71..2ef95e62503 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 @@ MAJOR_VERSION = "2.19" -PR = "r2" +PR = "r3" require util-linux.inc # note that `lscpu' is under GPLv3+ @@ -8,6 +8,7 @@ LICENSE_util-linux-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://remove_sigsetmark.patch \ " SRC_URI[md5sum] = "3eab06f05163dfa65479c44e5231932c" |