From 4d7292675af34fa0807c78089a5ea6b3e7b897eb Mon Sep 17 00:00:00 2001 From: Niklas Cassel Date: Tue, 18 Feb 2025 10:48:16 +0000 Subject: [PATCH] package/linux-tools: perf: Fix _BIN_ARCH_EXCLUDE support/scripts/check-bin-arch has an option -i to exclude a path (or many paths by using -i multiple times). This was implemented in commit 01d90f0d093f ("spport/check-bin-arch: accept arbitrary per-package ignore paths"). Looking at this feature (which hasn't changed since being added), we can see that check-bin-arch automatically adds a trailing slash to all entries specified using -i. Thus, specifying a path to a file, e.g. "/usr/libexec/perf-core/tests/pe-file.exe" will cause check-bin-arch to add "/usr/libexec/perf-core/tests/pe-file.exe/" to the IGNORES array. When running the main loop, the file "/usr/libexec/perf-core/tests/pe-file.exe" will thus not be ignored, since it will not trigger a match the pattern that was added to the IGNORES array ("/usr/libexec/perf-core/tests/pe-file.exe/"). This means that the -i option in check-bin-arch only supports directories and not files. Fix the LINUX_TOOLS_BIN_ARCH_EXCLUDE in package/linux-tools/linux-tool-perf.mk.in to specify a directory, as the existing LINUX_TOOLS_BIN_ARCH_EXCLUDE can never have actually worked. Fixes: a7ad7816262d ("package/linux-tools: Exclude checking PE binaries from perf test") Signed-off-by: Niklas Cassel Acked-by: Florian Fainelli Signed-off-by: Julien Olivain --- package/linux-tools/linux-tool-perf.mk.in | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/package/linux-tools/linux-tool-perf.mk.in b/package/linux-tools/linux-tool-perf.mk.in index df3030439e..d67318571a 100644 --- a/package/linux-tools/linux-tool-perf.mk.in +++ b/package/linux-tools/linux-tool-perf.mk.in @@ -180,8 +180,7 @@ define PERF_INSTALL_REMOVE_SCRIPTS endef LINUX_TOOLS_BIN_ARCH_EXCLUDE += \ - /usr/libexec/perf-core/tests/pe-file.exe \ - /usr/libexec/perf-core/tests/pe-file.exe.debug + /usr/libexec/perf-core/tests/ endif define PERF_INSTALL_TARGET_CMDS