From: Alexander Kanavin <[email protected]> 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. Signed-off-by: Alexander Kanavin <[email protected]> --- .../procps/procps/pidfd.patch | 42 ------------------- .../{procps_4.0.4.bb => procps_4.0.5.bb} | 3 +- ...c-address-procps-4.0.5-compatibility.patch | 30 +++++++++++++ .../igt-gpu-tools/igt-gpu-tools_1.30.bb | 4 +- 4 files changed, 34 insertions(+), 45 deletions(-) delete mode 100644 meta/recipes-extended/procps/procps/pidfd.patch rename meta/recipes-extended/procps/{procps_4.0.4.bb => procps_4.0.5.bb} (97%) create mode 100644 meta/recipes-graphics/igt-gpu-tools/igt-gpu-tools/0001-lib-igt_aux.c-address-procps-4.0.5-compatibility.patch diff --git a/meta/recipes-extended/procps/procps/pidfd.patch b/meta/recipes-extended/procps/procps/pidfd.patch deleted file mode 100644 index 23d1a3cd3ea..00000000000 --- a/meta/recipes-extended/procps/procps/pidfd.patch +++ /dev/null @@ -1,42 +0,0 @@ -From c8f625e085b8249cc009e8b19c3a19100217eb35 Mon Sep 17 00:00:00 2001 -From: Ross Burton <[email protected]> -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 <[email protected]> ---- - -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.5.bb similarity index 97% rename from meta/recipes-extended/procps/procps_4.0.4.bb rename to meta/recipes-extended/procps/procps_4.0.5.bb index b02f74bd6bb..3be40c38a4e 100644 --- a/meta/recipes-extended/procps/procps_4.0.4.bb +++ b/meta/recipes-extended/procps/procps_4.0.5.bb @@ -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" diff --git a/meta/recipes-graphics/igt-gpu-tools/igt-gpu-tools/0001-lib-igt_aux.c-address-procps-4.0.5-compatibility.patch b/meta/recipes-graphics/igt-gpu-tools/igt-gpu-tools/0001-lib-igt_aux.c-address-procps-4.0.5-compatibility.patch new file mode 100644 index 00000000000..7db773fe0db --- /dev/null +++ b/meta/recipes-graphics/igt-gpu-tools/igt-gpu-tools/0001-lib-igt_aux.c-address-procps-4.0.5-compatibility.patch @@ -0,0 +1,30 @@ +From 173cdf607bf39c13eb4d4b0dadcb9dc6add76014 Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin <[email protected]> +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 <[email protected]> +--- + 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; diff --git a/meta/recipes-graphics/igt-gpu-tools/igt-gpu-tools_1.30.bb b/meta/recipes-graphics/igt-gpu-tools/igt-gpu-tools_1.30.bb index a302e1877fc..dad752cb199 100644 --- a/meta/recipes-graphics/igt-gpu-tools/igt-gpu-tools_1.30.bb +++ b/meta/recipes-graphics/igt-gpu-tools/igt-gpu-tools_1.30.bb @@ -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" -- 2.39.5
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#209530): https://lists.openembedded.org/g/openembedded-core/message/209530 Mute This Topic: https://lists.openembedded.org/mt/110493596/21656 Group Owner: [email protected] Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
