mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-04-21 12:32:15 +02:00
Code Issues Packages Projects Releases Wiki Activity

procps: update 4.0.4 -> 4.0.5

Browse Source 
Drop pidfd.patch (upstream significantly refactored the code; the patch can be tested
only with very old kernels; upstream submission has not been followed up since initial
MR creation).

Add a patch to igt-gpu-tools to address a build failure with the new procps.

(From OE-Core rev: ba492417cf8712ca8009154cfadeb494c1a6064f)

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Alexander Kanavin
2025-01-08 09:42:14 +01:00
committed by Richard Purdie
parent 47d5dcef90
commit e59da05be4
4 changed files with 34 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
meta/recipes-extended/procps/procps/pidfd.patch
View File

@@ -1,42 +0,0 @@
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: Submitted [https://gitlab.com/procps-ng/procps/-/merge_requests/229]
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

3
meta/recipes-extended/procps/procps_4.0.4.bb → meta/recipes-extended/procps/procps_4.0.5.bb
View File

@@ -14,9 +14,8 @@ 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"
SRCREV = "f46b2f7929cdfe2913ed0a7f585b09d6adbf994e"
S = "${WORKDIR}/git"

30
meta/recipes-graphics/igt-gpu-tools/igt-gpu-tools/0001-lib-igt_aux.c-address-procps-4.0.5-compatibility.patch Normal file
View File

@@ -0,0 +1,30 @@
From 173cdf607bf39c13eb4d4b0dadcb9dc6add76014 Mon Sep 17 00:00:00 2001
From: Alexander Kanavin <alex@linutronix.de>
Date: Tue, 7 Jan 2025 09:54:07 +0100
Subject: [PATCH] lib/igt_aux.c: address procps 4.0.5 compatibility
Upstream-Status: Submitted [https://gitlab.freedesktop.org/drm/igt-gpu-tools/-/issues/164]
Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
lib/igt_aux.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/lib/igt_aux.c b/lib/igt_aux.c
index 3407cc4f2..7028d3f57 100644
--- a/lib/igt_aux.c
+++ b/lib/igt_aux.c
@@ -1358,10 +1358,10 @@ static bool get_process_ids(struct igt_process *prcs)
prcs->comm = NULL;
prcs->stack = procps_pids_get(prcs->info, PIDS_FETCH_TASKS_ONLY);
if (prcs->stack) {
- prcs->tid = PIDS_VAL(EU_PID, s_int, prcs->stack, prcs->info);
- prcs->euid = PIDS_VAL(EU_EUID, s_int, prcs->stack, prcs->info);
- prcs->egid = PIDS_VAL(EU_EGID, s_int, prcs->stack, prcs->info);
- prcs->comm = PIDS_VAL(EU_CMD, str, prcs->stack, prcs->info);
+ prcs->tid = PIDS_VAL(EU_PID, s_int, prcs->stack);
+ prcs->euid = PIDS_VAL(EU_EUID, s_int, prcs->stack);
+ prcs->egid = PIDS_VAL(EU_EGID, s_int, prcs->stack);
+ prcs->comm = PIDS_VAL(EU_CMD, str, prcs->stack);
}
#endif
return prcs->tid != 0;

4
meta/recipes-graphics/igt-gpu-tools/igt-gpu-tools_1.30.bb
View File

@@ -11,7 +11,9 @@ inherit meson pkgconfig
SRCREV = "edf352a96646c8d793f0c1eb11795112f9bde725"
SRC_URI = "git://gitlab.freedesktop.org/drm/igt-gpu-tools.git;protocol=https;branch=master"
SRC_URI = "git://gitlab.freedesktop.org/drm/igt-gpu-tools.git;protocol=https;branch=master \
file://0001-lib-igt_aux.c-address-procps-4.0.5-compatibility.patch \
"
S = "${WORKDIR}/git"