From cf26158dc72047d906d3e0faf9d36ff078345ce4 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Thu, 11 Sep 2025 10:51:20 +0200 Subject: [PATCH] igt-gpu-tools: update 1.30 -> 2.1 Drop patch merged upstream. Signed-off-by: Alexander Kanavin Signed-off-by: Mathieu Dubois-Briand Signed-off-by: Richard Purdie --- ...c-address-procps-4.0.5-compatibility.patch | 30 ------------------- ...gpu-tools_1.30.bb => igt-gpu-tools_2.1.bb} | 5 ++-- 2 files changed, 2 insertions(+), 33 deletions(-) delete mode 100644 meta/recipes-graphics/igt-gpu-tools/igt-gpu-tools/0001-lib-igt_aux.c-address-procps-4.0.5-compatibility.patch rename meta/recipes-graphics/igt-gpu-tools/{igt-gpu-tools_1.30.bb => igt-gpu-tools_2.1.bb} (91%) 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 deleted file mode 100644 index 7db773fe0d..0000000000 --- a/meta/recipes-graphics/igt-gpu-tools/igt-gpu-tools/0001-lib-igt_aux.c-address-procps-4.0.5-compatibility.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 173cdf607bf39c13eb4d4b0dadcb9dc6add76014 Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin -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 ---- - 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_2.1.bb similarity index 91% rename from meta/recipes-graphics/igt-gpu-tools/igt-gpu-tools_1.30.bb rename to meta/recipes-graphics/igt-gpu-tools/igt-gpu-tools_2.1.bb index 1eae416c01..96f3530436 100644 --- a/meta/recipes-graphics/igt-gpu-tools/igt-gpu-tools_1.30.bb +++ b/meta/recipes-graphics/igt-gpu-tools/igt-gpu-tools_2.1.bb @@ -9,10 +9,9 @@ LICENSE = "MIT" inherit meson pkgconfig -SRCREV = "edf352a96646c8d793f0c1eb11795112f9bde725" +SRCREV = "4871829d8b7117553eb2dc1bdb9a0d18de428a98" -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 \ +SRC_URI = "git://gitlab.freedesktop.org/drm/igt-gpu-tools.git;protocol=https;branch=master;tag=v${PV} \ " DEPENDS += "libdrm libpciaccess cairo udev glib-2.0 procps libunwind kmod openssl elfutils alsa-lib json-c bison-native" -- 2.47.3