mirror of
https://git.yoctoproject.org/poky
synced 2026-02-21 00:49:41 +01:00
util-linux: upgrade 2.35.2 -> 2.36
(From OE-Core rev: 93cb61e5e6943b35f3cd9b724daa05e090815a50) Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
committed by
Richard Purdie
parent
857833ad4a
commit
fe9364fc7b
@@ -1,42 +0,0 @@
|
||||
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
|
||||
|
||||
@@ -1,13 +0,0 @@
|
||||
require util-linux.inc
|
||||
|
||||
SRC_URI += "file://configure-sbindir.patch \
|
||||
file://runuser.pamd \
|
||||
file://runuser-l.pamd \
|
||||
file://ptest.patch \
|
||||
file://run-ptest \
|
||||
file://display_testname_for_subtest.patch \
|
||||
file://avoid_parallel_tests.patch \
|
||||
file://0001-include-cleanup-pidfd-inckudes.patch \
|
||||
"
|
||||
SRC_URI[md5sum] = "248a4d0810c9193e0e9a4bb3f26b93d8"
|
||||
SRC_URI[sha256sum] = "21b7431e82f6bcd9441a01beeec3d57ed33ee948f8a5b41da577073c372eb58a"
|
||||
12
meta/recipes-core/util-linux/util-linux_2.36.bb
Normal file
12
meta/recipes-core/util-linux/util-linux_2.36.bb
Normal file
@@ -0,0 +1,12 @@
|
||||
require util-linux.inc
|
||||
|
||||
SRC_URI += "${KERNELORG_MIRROR}/linux/utils/${BPN}/v${MAJOR_VERSION}/${BP}.tar.xz \
|
||||
file://configure-sbindir.patch \
|
||||
file://runuser.pamd \
|
||||
file://runuser-l.pamd \
|
||||
file://ptest.patch \
|
||||
file://run-ptest \
|
||||
file://display_testname_for_subtest.patch \
|
||||
file://avoid_parallel_tests.patch \
|
||||
"
|
||||
SRC_URI[sha256sum] = "9e4b1c67eb13b9b67feb32ae1dc0d50e08ce9e5d82e1cccd0ee771ad2fa9e0b1"
|
||||
Reference in New Issue
Block a user