[PATCH v2] mesa: fix QA warnings caused by freedreno tools

[PATCH v2] mesa: fix QA warnings caused by freedreno tools

[Dmitry Baryshkov]

Fix following QA warnings / errors

File /usr/bin/afuc-asm in package mesa-tools contains reference to TMPDIR [buildpaths]
File /usr/bin/afuc-disasm in package mesa-tools contains reference to TMPDIR [buildpaths]

Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
---
 ...t-include-rnn_src_path-into-rnn_path.patch | 27 +++++++++++++++++++
 meta/recipes-graphics/mesa/mesa.inc           |  1 +
 2 files changed, 28 insertions(+)
 create mode 100644 meta/recipes-graphics/mesa/files/0001-freedreno-don-t-include-rnn_src_path-into-rnn_path.patch

diff --git a/meta/recipes-graphics/mesa/files/0001-freedreno-don-t-include-rnn_src_path-into-rnn_path.patch b/meta/recipes-graphics/mesa/files/0001-freedreno-don-t-include-rnn_src_path-into-rnn_path.patch
new file mode 100644
index 000000000000..2741f87ed00b
--- /dev/null
+++ b/meta/recipes-graphics/mesa/files/0001-freedreno-don-t-include-rnn_src_path-into-rnn_path.patch
@@ -0,0 +1,27 @@
+From 7a8044621ae7dcba1873a13190ac51a6465937b7 Mon Sep 17 00:00:00 2001
+From: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
+Date: Mon, 15 Jul 2024 22:23:32 +0300
+Subject: [PATCH] freedreno: don't include rnn_src_path into rnn_path
+
+rnn_path gets compiled-in into several tools, which triggers OE QA
+errors. Remove rnn_src_path from rnn_path.
+
+Upstream-Status: Inappropriate [OE-Core QA issue]
+Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
+---
+ src/freedreno/meson.build | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/freedreno/meson.build b/src/freedreno/meson.build
+index cae09c88edbb..20a121b43b1c 100644
+--- a/src/freedreno/meson.build
++++ b/src/freedreno/meson.build
+@@ -23,7 +23,7 @@ inc_freedreno_rnn = include_directories('rnn')
+ 
+ rnn_src_path = dir_source_root + '/src/freedreno/registers'
+ rnn_install_path = get_option('datadir') + '/freedreno/registers'
+-rnn_path = rnn_src_path + ':' + get_option('prefix') + '/' + rnn_install_path
++rnn_path = get_option('prefix') + '/' + rnn_install_path
+ 
+ dep_lua = dependency('lua54', 'lua53', 'lua52', 'lua', required: false,
+                      allow_fallback: true, version: '>=5.2')
diff --git a/meta/recipes-graphics/mesa/mesa.inc b/meta/recipes-graphics/mesa/mesa.inc
index c426e8fddd46..2522294a047d 100644
--- a/meta/recipes-graphics/mesa/mesa.inc
+++ b/meta/recipes-graphics/mesa/mesa.inc
@@ -20,6 +20,7 @@ SRC_URI = "https://mesa.freedesktop.org/archive/mesa-${PV}.tar.xz \
            file://0002-glxext-don-t-try-zink-if-not-enabled-in-mesa.patch \
            file://0001-Revert-meson-do-not-pull-in-clc-for-clover.patch \
            file://0001-amd-Include-missing-llvm-IR-header-Module.h.patch \
+           file://0001-freedreno-don-t-include-rnn_src_path-into-rnn_path.patch \
 "
 
 SRC_URI[sha256sum] = "7454425f1ed4a6f1b5b107e1672b30c88b22ea0efea000ae2c7d96db93f6c26a"
-- 
2.39.2

Re: [OE-core] [PATCH v2] mesa: fix QA warnings caused by freedreno tools

[Richard Purdie]

On Tue, 2024-07-16 at 02:05 +0300, Dmitry Baryshkov via lists.openembedded.org wrote:
> Fix following QA warnings / errors
> 
> File /usr/bin/afuc-asm in package mesa-tools contains reference to TMPDIR [buildpaths]
> File /usr/bin/afuc-disasm in package mesa-tools contains reference to TMPDIR [buildpaths]
> 
> Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
> ---
>  ...t-include-rnn_src_path-into-rnn_path.patch | 27 +++++++++++++++++++
>  meta/recipes-graphics/mesa/mesa.inc           |  1 +
>  2 files changed, 28 insertions(+)
>  create mode 100644 meta/recipes-graphics/mesa/files/0001-freedreno-don-t-include-rnn_src_path-into-rnn_path.patch
> 
> diff --git a/meta/recipes-graphics/mesa/files/0001-freedreno-don-t-include-rnn_src_path-into-rnn_path.patch b/meta/recipes-graphics/mesa/files/0001-freedreno-don-t-include-rnn_src_path-into-rnn_path.patch
> new file mode 100644
> index 000000000000..2741f87ed00b
> --- /dev/null
> +++ b/meta/recipes-graphics/mesa/files/0001-freedreno-don-t-include-rnn_src_path-into-rnn_path.patch
> @@ -0,0 +1,27 @@
> +From 7a8044621ae7dcba1873a13190ac51a6465937b7 Mon Sep 17 00:00:00 2001
> +From: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
> +Date: Mon, 15 Jul 2024 22:23:32 +0300
> +Subject: [PATCH] freedreno: don't include rnn_src_path into rnn_path
> +
> +rnn_path gets compiled-in into several tools, which triggers OE QA
> +errors. Remove rnn_src_path from rnn_path.
> +
> +Upstream-Status: Inappropriate [OE-Core QA issue]
> +Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
> +---
> + src/freedreno/meson.build | 2 +-
> + 1 file changed, 1 insertion(+), 1 deletion(-)
> +

I'm not sure Inapproriate is the right choice here. I'd say this is an
actual bug in mesa when cross compiling. When cross compiling the build
system shouldn't be putting build paths into target binaries.

We should really discuss this with upstream and see if mesa can avoid
doing this when cross compiling?

Cheers,

Richard