From: Ankur Tyagi <[email protected]> Dropped patch that is part of the upstream version[1]
Changelog: https://gitlab.freedesktop.org/drm/igt-gpu-tools/-/blob/v2.6/NEWS?ref_type=tags [1]https://gitlab.freedesktop.org/drm/igt-gpu-tools/-/commit/573a2c9824ce7893a32b8ce6022d21d7b5434842 Signed-off-by: Ankur Tyagi <[email protected]> --- ...do-not-hardcode-the-build-directory-.patch | 46 ------------------- ...-gpu-tools_2.5.bb => igt-gpu-tools_2.6.bb} | 3 +- 2 files changed, 1 insertion(+), 48 deletions(-) delete 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.5.bb => igt-gpu-tools_2.6.bb} (93%) 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 deleted file mode 100644 index 3cf6263290..0000000000 --- a/meta/recipes-graphics/igt-gpu-tools/igt-gpu-tools/0001-lib-meson.build-do-not-hardcode-the-build-directory-.patch +++ /dev/null @@ -1,46 +0,0 @@ -From 5681532ed4e1b656219bf887bbeadbe3ee6d277d Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin <[email protected]> -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 <[email protected]> ---- - lib/meson.build | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/lib/meson.build b/lib/meson.build -index d1289a5e0..a8c15be8e 100644 ---- a/lib/meson.build -+++ b/lib/meson.build -@@ -309,7 +309,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.5.bb b/meta/recipes-graphics/igt-gpu-tools/igt-gpu-tools_2.6.bb similarity index 93% rename from meta/recipes-graphics/igt-gpu-tools/igt-gpu-tools_2.5.bb rename to meta/recipes-graphics/igt-gpu-tools/igt-gpu-tools_2.6.bb index f03bf46630..d76c2355a1 100644 --- a/meta/recipes-graphics/igt-gpu-tools/igt-gpu-tools_2.5.bb +++ b/meta/recipes-graphics/igt-gpu-tools/igt-gpu-tools_2.6.bb @@ -9,10 +9,9 @@ LICENSE = "MIT" inherit meson pkgconfig -SRCREV = "a8e2cbd2854d7980a9eccecc6e0c801d0824b88f" +SRCREV = "916c79cfb7675ca01607dcd821f8c49d4f633a6f" 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 pciutils jansson"
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#246958): https://lists.openembedded.org/g/openembedded-core/message/246958 Mute This Topic: https://lists.openembedded.org/mt/121506366/21656 Group Owner: [email protected] Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
