parent
874c7843c8
commit
97ff4fd35d
2 changed files with 3 additions and 47 deletions
|
@ -1,44 +0,0 @@
|
||||||
upstream: yes
|
|
||||||
reason: fixes compilation for armv6-musl
|
|
||||||
|
|
||||||
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: include: cleanup pidfd inckudes
|
|
||||||
|
|
||||||
Signed-off-by: Karel Zak <kzak@redhat.com>
|
|
||||||
---
|
|
||||||
include/pidfd-utils.h | 6 +++---
|
|
||||||
1 file changed, 3 insertions(+), 3 deletions(-)
|
|
||||||
|
|
||||||
(limited to 'include/pidfd-utils.h')
|
|
||||||
|
|
||||||
diff --git a/include/pidfd-utils.h b/include/pidfd-utils.h
|
|
||||||
index 0baedd2c9..4a6c3a604 100644
|
|
||||||
--- include/pidfd-utils.h
|
|
||||||
+++ 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);
|
|
||||||
--
|
|
||||||
cgit 1.2.3-1.el7
|
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
# Template file for 'util-linux'
|
# Template file for 'util-linux'
|
||||||
# Keep this package sync with util-linux-libs
|
# Keep this package sync with util-linux-libs
|
||||||
pkgname=util-linux
|
pkgname=util-linux
|
||||||
version=2.35.2
|
version=2.36
|
||||||
revision=1
|
revision=1
|
||||||
hostmakedepends="automake bison gettext gettext-devel libtool pkg-config xz"
|
hostmakedepends="automake bison gettext gettext-devel libtool pkg-config xz"
|
||||||
makedepends="libcap-ng-devel pam-devel readline-devel zlib-devel
|
makedepends="libcap-ng-devel pam-devel readline-devel zlib-devel
|
||||||
|
@ -12,8 +12,8 @@ short_desc="Miscellaneous linux utilities"
|
||||||
maintainer="Enno Boland <gottox@voidlinux.org>"
|
maintainer="Enno Boland <gottox@voidlinux.org>"
|
||||||
license="GPL-2.0-or-later"
|
license="GPL-2.0-or-later"
|
||||||
homepage="https://www.kernel.org/pub/linux/utils/util-linux/"
|
homepage="https://www.kernel.org/pub/linux/utils/util-linux/"
|
||||||
distfiles="${KERNEL_SITE}/utils/${pkgname}/v2.35/${pkgname}-${version}.tar.xz"
|
distfiles="${KERNEL_SITE}/utils/${pkgname}/v${version%.${version#*.*.}}/${pkgname}-${version}.tar.xz"
|
||||||
checksum=21b7431e82f6bcd9441a01beeec3d57ed33ee948f8a5b41da577073c372eb58a
|
checksum=9e4b1c67eb13b9b67feb32ae1dc0d50e08ce9e5d82e1cccd0ee771ad2fa9e0b1
|
||||||
|
|
||||||
# Create uuidd system account for uuidd.
|
# Create uuidd system account for uuidd.
|
||||||
system_accounts="_uuidd"
|
system_accounts="_uuidd"
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue