From: Khem Raj <raj.khem@gmail.com>
To: openembedded-core@lists.openembedded.org
Subject: [PATCH 6/6] util-linux: Replace sigsetmask with posix compliant functions
Date: Wed, 20 Jul 2011 23:10:17 -0700 [thread overview]
Message-ID: <1311228617-29732-6-git-send-email-raj.khem@gmail.com> (raw)
In-Reply-To: <1311228617-29732-1-git-send-email-raj.khem@gmail.com>
This patch is not needed upstream since the code using sigsetmask
has been deleted.
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
.../util-linux-2.19.1/remove_sigsetmark.patch | 35 ++++++++++++++++++++
meta/recipes-core/util-linux/util-linux_2.19.1.bb | 3 +-
2 files changed, 37 insertions(+), 1 deletions(-)
create mode 100644 meta/recipes-core/util-linux/util-linux-2.19.1/remove_sigsetmark.patch
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 0000000..02e4d16
--- /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 0fd67d1..2ef95e6 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"
--
1.7.4.1
next prev parent reply other threads:[~2011-07-21 6:14 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-07-21 6:10 [PATCH 1/6] mesa-xlib, mesa-dri: Probe for newlocale() before using it Khem Raj
2011-07-21 6:10 ` [PATCH 2/6] task-core-tools.bb: Exclude lttng-ust for x86_64/uclibc Khem Raj
2011-07-21 6:10 ` [PATCH 3/6] libiconv: Fix build failure on 1.13.1 Khem Raj
2011-07-21 8:12 ` Henning Heinold
2011-07-21 15:53 ` Khem Raj
2011-07-21 6:10 ` [PATCH 4/6] uclibc: Add patch header for sync_file_range2.patch Khem Raj
2011-07-21 6:10 ` [PATCH 5/6] strace: Define own sigmask macro if not defined already in signal.h Khem Raj
2011-07-21 6:10 ` Khem Raj [this message]
2011-07-22 15:26 ` [PATCH 1/6] mesa-xlib, mesa-dri: Probe for newlocale() before using it Saul Wold
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1311228617-29732-6-git-send-email-raj.khem@gmail.com \
--to=raj.khem@gmail.com \
--cc=openembedded-core@lists.openembedded.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox