mirror of
https://git.yoctoproject.org/poky
synced 2026-08-04 13:17:45 +02:00
16d76aa636
Backport patches from upstream to fix a build error in the kill utility. Fixes: | In file included from ../util-linux-2.35.1/misc-utils/kill.c:57: | ../util-linux-2.35.1/include/pidfd-utils.h: In function ‘pidfd_open’: | ../util-linux-2.35.1/include/pidfd-utils.h:19:17: error: ‘SYS_pidfd_open’ undeclared (first use in this function); did you mean ‘pidfd_open’? (From OE-Core rev: 9620c4e6e0e184b2b3907c8f8da4b7b54b97354e) Signed-off-by: Benjamin Fair <benjaminfair@google.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> Signed-off-by: Steve Sakoman <steve@sakoman.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
43 lines
1.3 KiB
Diff
43 lines
1.3 KiB
Diff
From 0a4035ff2e4fd5b5ae0cf8f8665696c2aff53b75 Mon Sep 17 00:00:00 2001
|
|
From: Karel Zak <kzak@redhat.com>
|
|
Date: Tue, 10 Mar 2020 11:43:16 +0100
|
|
Subject: [PATCH] include: cleanup pidfd inckudes
|
|
|
|
Upstream-Status: Backport [https://github.com/karelzak/util-linux/commit/0a4035ff2e4fd5b5ae0cf8f8665696c2aff53b75]
|
|
|
|
Signed-off-by: Karel Zak <kzak@redhat.com>
|
|
Signed-off-by: Benjamin Fair <benjaminfair@google.com>
|
|
---
|
|
include/pidfd-utils.h | 6 +++---
|
|
1 file changed, 3 insertions(+), 3 deletions(-)
|
|
|
|
diff --git a/include/pidfd-utils.h b/include/pidfd-utils.h
|
|
index 0baedd2c9..4a6c3a604 100644
|
|
--- a/include/pidfd-utils.h
|
|
+++ b/include/pidfd-utils.h
|
|
@@ -3,10 +3,10 @@
|
|
|
|
#if defined(__linux__)
|
|
# include <sys/syscall.h>
|
|
-# if defined(SYS_pidfd_send_signal)
|
|
+# if defined(SYS_pidfd_send_signal) && defined(SYS_pidfd_open)
|
|
# include <sys/types.h>
|
|
|
|
-# ifndef HAVE_PIDFD_OPEN
|
|
+# ifndef HAVE_PIDFD_SEND_SIGNAL
|
|
static inline int pidfd_send_signal(int pidfd, int sig, siginfo_t *info,
|
|
unsigned int flags)
|
|
{
|
|
@@ -14,7 +14,7 @@ static inline int pidfd_send_signal(int pidfd, int sig, siginfo_t *info,
|
|
}
|
|
# endif
|
|
|
|
-# ifndef HAVE_PIDFD_SEND_SIGNAL
|
|
+# ifndef HAVE_PIDFD_OPEN
|
|
static inline int pidfd_open(pid_t pid, unsigned int flags)
|
|
{
|
|
return syscall(SYS_pidfd_open, pid, flags);
|
|
--
|
|
2.26.1.301.g55bc3eb7cb9-goog
|
|
|