mirror of
https://git.yoctoproject.org/meta-arm
synced 2026-04-20 23:41:08 +00:00
fef5eafc08
This patch will be merged upstream soon, apply it locally to unblock CI. Signed-off-by: Ross Burton <ross.burton@arm.com> Signed-off-by: Jon Mason <jon.mason@arm.com>
80 lines
2.7 KiB
Diff
80 lines
2.7 KiB
Diff
From 42358d889ed652a8c386862f8c65e5fbe7484de2 Mon Sep 17 00:00:00 2001
|
|
From: Ross Burton <ross.burton@arm.com>
|
|
Date: Fri, 26 Apr 2024 10:38:28 +0000
|
|
Subject: [PATCH] procps: fix build with new glibc but old kernel headers
|
|
|
|
If you're building procps with a newer glibc (with pidfd_open()) but
|
|
older kernel headers (say 4.x, before __NR_pidfd_open) then procps will
|
|
fail to build because of a typo in configure.ac.
|
|
|
|
Signed-off-by: Ross Burton <ross.burton@arm.com>
|
|
---
|
|
.../procps/procps/pidfd.patch | 42 +++++++++++++++++++
|
|
meta/recipes-extended/procps/procps_4.0.4.bb | 1 +
|
|
2 files changed, 43 insertions(+)
|
|
create mode 100644 meta/recipes-extended/procps/procps/pidfd.patch
|
|
|
|
diff --git a/meta/recipes-extended/procps/procps/pidfd.patch b/meta/recipes-extended/procps/procps/pidfd.patch
|
|
new file mode 100644
|
|
index 00000000000..f5e8183e547
|
|
--- /dev/null
|
|
+++ b/meta/recipes-extended/procps/procps/pidfd.patch
|
|
@@ -0,0 +1,42 @@
|
|
+From c8f625e085b8249cc009e8b19c3a19100217eb35 Mon Sep 17 00:00:00 2001
|
|
+From: Ross Burton <ross.burton@arm.com>
|
|
+Date: Thu, 25 Apr 2024 13:33:15 +0000
|
|
+Subject: [PATCH] Fix pidfd_open detection
|
|
+
|
|
+This check for pidfd_open uses AC_CHECK_FUNC which just runs the specified code, but
|
|
+src/pgrep.c checks HAVE_PIDFD_OPEN which will only be defined by AC_CHECK_FUNCS.
|
|
+
|
|
+Also pidfd_open is defined in sys/pidfd.h so that needs including.
|
|
+
|
|
+Upstream-Status: Pending
|
|
+Signed-off-by: Ross Burton <ross.burton@arm.com>
|
|
+---
|
|
+
|
|
+diff --git a/configure.ac b/configure.ac
|
|
+index fec27e3f..024731c7 100644
|
|
+--- a/configure.ac
|
|
++++ b/configure.ac
|
|
+@@ -170,7 +170,7 @@ AC_TRY_COMPILE([#include <errno.h>],
|
|
+ AC_MSG_RESULT(yes),
|
|
+ AC_MSG_RESULT(no))
|
|
+
|
|
+-AC_CHECK_FUNC([pidfd_open], [enable_pidwait=yes], [
|
|
++AC_CHECK_FUNCS([pidfd_open], [enable_pidwait=yes], [
|
|
+ AC_MSG_CHECKING([for __NR_pidfd_open])
|
|
+ AC_COMPILE_IFELSE([AC_LANG_SOURCE([
|
|
+ #include <sys/syscall.h>
|
|
+diff --git a/src/pgrep.c b/src/pgrep.c
|
|
+index d8e57dff..c5211aec 100644
|
|
+--- a/src/pgrep.c
|
|
++++ b/src/pgrep.c
|
|
+@@ -44,7 +44,9 @@
|
|
+
|
|
+ #ifdef ENABLE_PIDWAIT
|
|
+ #include <sys/epoll.h>
|
|
+-#ifndef HAVE_PIDFD_OPEN
|
|
++#ifdef HAVE_PIDFD_OPEN
|
|
++#include <sys/pidfd.h>
|
|
++#else
|
|
+ #include <sys/syscall.h>
|
|
+ #endif /* !HAVE_PIDFD_OPEN */
|
|
+ #endif
|
|
diff --git a/meta/recipes-extended/procps/procps_4.0.4.bb b/meta/recipes-extended/procps/procps_4.0.4.bb
|
|
index 800384f22f7..ec8c4b0261b 100644
|
|
--- a/meta/recipes-extended/procps/procps_4.0.4.bb
|
|
+++ b/meta/recipes-extended/procps/procps_4.0.4.bb
|
|
@@ -14,6 +14,7 @@ inherit autotools gettext pkgconfig update-alternatives
|
|
|
|
SRC_URI = "git://gitlab.com/procps-ng/procps.git;protocol=https;branch=master \
|
|
file://sysctl.conf \
|
|
+ file://pidfd.patch \
|
|
"
|
|
SRCREV = "4ddcef2fd843170c8e2d59a83042978f41037a2b"
|
|
|
|
--
|
|
2.34.1
|
|
|