From: Ben Hutchings <benh@debian.org>
Date: Mon, 29 May 2023 22:16:39 +0000 (+0200)
Subject: linux-perf: Remove remaining source filenames from executable
X-Git-Tag: archive/raspbian/6.17.13-1+rpi1~2^2~48
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=aeb76b4a9c3041187d04c7971588572203f6f860;p=linux.git

linux-perf: Remove remaining source filenames from executable

When we build perf with -ffile-prefix-map, there are still 2
source directory names embedded in the executable:

1. The Documentation subdirectory, used as a fallback from the
   installed location.
2. The python subdirectory, used in the Python script test.

Remove (1) since it is an unnecessary fallback.  Change (2)
to the installed location.


Gbp-Pq: Topic debian
Gbp-Pq: Name linux-perf-remove-remaining-source-filenames-from-executable.patch
---

diff --git a/tools/perf/Build b/tools/perf/Build
index b03cc59dabf..f62599cc21a 100644
--- a/tools/perf/Build
+++ b/tools/perf/Build
@@ -52,7 +52,7 @@ CFLAGS_perf.o              += -DPERF_HTML_PATH="BUILD_STR($(htmldir_SQ))"	\
 			      -DPREFIX="BUILD_STR($(prefix_SQ))"
 CFLAGS_builtin-trace.o	   += -DSTRACE_GROUPS_DIR="BUILD_STR($(STRACE_GROUPS_DIR_SQ))"
 CFLAGS_builtin-report.o	   += -DTIPDIR="BUILD_STR($(tipdir_SQ))"
-CFLAGS_builtin-report.o	   += -DDOCDIR="BUILD_STR($(srcdir_SQ)/Documentation)"
+#CFLAGS_builtin-report.o	   += -DDOCDIR="BUILD_STR($(srcdir_SQ)/Documentation)"
 
 perf-util-y += util/
 perf-util-y += arch/
diff --git a/tools/perf/builtin-report.c b/tools/perf/builtin-report.c
index 35df04dad2f..4a9a3949af4 100644
--- a/tools/perf/builtin-report.c
+++ b/tools/perf/builtin-report.c
@@ -669,10 +669,12 @@ static int report__browse_hists(struct report *rep)
 
 	path = system_path(TIPDIR);
 	if (perf_tip(&help, path) || help == NULL) {
+#if 0
 		/* fallback for people who don't install perf ;-) */
 		free(path);
 		path = system_path(DOCDIR);
 		if (perf_tip(&help, path) || help == NULL)
+#endif
 			help = strdup("Cannot load tips.txt file, please install perf!");
 	}
 	free(path);
diff --git a/tools/perf/tests/Build b/tools/perf/tests/Build
index 3e8394be15a..3e25a6e358b 100644
--- a/tools/perf/tests/Build
+++ b/tools/perf/tests/Build
@@ -75,7 +75,7 @@ ifeq ($(SRCARCH),$(filter $(SRCARCH),x86 arm arm64 powerpc))
 perf-test-$(CONFIG_DWARF_UNWIND) += dwarf-unwind.o
 endif
 
-CFLAGS_python-use.o   += -DPYTHONPATH="BUILD_STR($(OUTPUT)python)" -DPYTHON="BUILD_STR($(PYTHON_WORD))"
+CFLAGS_python-use.o   += -DPYTHONPATH="BUILD_STR($(perfexec_instdir_SQ)/scripts/python)" -DPYTHON="BUILD_STR($(PYTHON_WORD))"
 CFLAGS_dwarf-unwind.o += -fno-optimize-sibling-calls
 
 perf-test-y += workloads/