diff mbox series

[v2] igt-gpu-tools: upgrade 2.1 -> 2.3

Message ID 20260106114057.3887879-1-alex.kanavin@gmail.com
State Under Review
Headers show
Series [v2] igt-gpu-tools: upgrade 2.1 -> 2.3 | expand

Commit Message

Alexander Kanavin Jan. 6, 2026, 11:40 a.m. UTC 
From: Alexander Kanavin <alex@linutronix.de>

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
v2: add details about how and where the variable with the bogus value
is used
---
 ...do-not-hardcode-the-build-directory-.patch | 47 +++++++++++++++++++
 ...-gpu-tools_2.1.bb => igt-gpu-tools_2.3.bb} |  3 +-
 2 files changed, 49 insertions(+), 1 deletion(-)
 create mode 100644 meta/recipes-graphics/igt-gpu-tools/igt-gpu-tools/0001-lib-meson.build-do-not-hardcode-the-build-directory-.patch
 rename meta/recipes-graphics/igt-gpu-tools/{igt-gpu-tools_2.1.bb => igt-gpu-tools_2.3.bb} (93%)
diff mbox series

Patch

diff --git a/meta/recipes-graphics/igt-gpu-tools/igt-gpu-tools/0001-lib-meson.build-do-not-hardcode-the-build-directory-.patch b/meta/recipes-graphics/igt-gpu-tools/igt-gpu-tools/0001-lib-meson.build-do-not-hardcode-the-build-directory-.patch
new file mode 100644
index 0000000000..7ff8aa22a9
--- /dev/null
+++ b/meta/recipes-graphics/igt-gpu-tools/igt-gpu-tools/0001-lib-meson.build-do-not-hardcode-the-build-directory-.patch
@@ -0,0 +1,47 @@ 
+From 27fd94beadfc29ea4ad82f660dbdb2540d0b6b97 Mon Sep 17 00:00:00 2001
+From: Alexander Kanavin <alex@linutronix.de>
+Date: Thu, 18 Dec 2025 15:45:11 +0100
+Subject: [PATCH] lib/meson.build: do not hardcode the build directory into the
+ installable library
+
+This breaks reproducibility, and is not otherwise appropriate, as the
+original directory may not exist. If there's a use case for referring to
+it, the location should be passed in with a command line switch or
+environment variable.
+
+imgdir is set elsewhere in meson.build to:
+
+imgdir = join_paths(build_root, 'data')
+
+and them IGT_IMGDIR is used thusly in lib/igt_core.h:
+
+/**
+ * igt_fopen_data:
+ * @filename: filename to open.
+ *
+ * Open a datafile for test, first try from installation directory,
+ * then from build directory, and finally from current directory.
+ */
+#define igt_fopen_data(filename) \
+        __igt_fopen_data(IGT_SRCDIR, IGT_DATADIR, IGT_IMGDIR, filename)
+
+
+Upstream-Status: Inappropriate [hack patching in a bogus dir; issue reported at https://gitlab.freedesktop.org/drm/igt-gpu-tools/-/issues/190]
+Signed-off-by: Alexander Kanavin <alex@linutronix.de>
+---
+ lib/meson.build | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/lib/meson.build b/lib/meson.build
+index d0487fb3c..f6452e970 100644
+--- a/lib/meson.build
++++ b/lib/meson.build
+@@ -292,7 +292,7 @@ foreach f: lib_sources
+ 	    '-DIGT_DATADIR="@0@"'.format(join_paths(prefix, datadir)),
+ 	    '-DIGT_SRCDIR="@0@"'.format(srcdir),
+ 	    '-DIGT_LOG_DOMAIN="@0@"'.format(f.split('.')[0]),
+-            '-DIGT_IMGDIR="@0@"'.format(imgdir),
++            '-DIGT_IMGDIR="/this/is/a/bogus/dir"',
+ 	])
+ 
+     lib_intermediates += lib
diff --git a/meta/recipes-graphics/igt-gpu-tools/igt-gpu-tools_2.1.bb b/meta/recipes-graphics/igt-gpu-tools/igt-gpu-tools_2.3.bb
similarity index 93%
rename from meta/recipes-graphics/igt-gpu-tools/igt-gpu-tools_2.1.bb
rename to meta/recipes-graphics/igt-gpu-tools/igt-gpu-tools_2.3.bb
index 96f3530436..c92d10c617 100644
--- a/meta/recipes-graphics/igt-gpu-tools/igt-gpu-tools_2.1.bb
+++ b/meta/recipes-graphics/igt-gpu-tools/igt-gpu-tools_2.3.bb
@@ -9,9 +9,10 @@  LICENSE = "MIT"
 
 inherit meson pkgconfig
 
-SRCREV = "4871829d8b7117553eb2dc1bdb9a0d18de428a98"
+SRCREV = "2d7ec9a36c550c48af4bdd6e748f6753369ab8ff"
 
 SRC_URI = "git://gitlab.freedesktop.org/drm/igt-gpu-tools.git;protocol=https;branch=master;tag=v${PV} \
+           file://0001-lib-meson.build-do-not-hardcode-the-build-directory-.patch \
            "
 
 DEPENDS += "libdrm libpciaccess cairo udev glib-2.0 procps libunwind kmod openssl elfutils alsa-lib json-c bison-native"