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 b03cc59dabf81d1132ac16d8a2fe653d4b361f59..f62599cc21af05b0a28558e678f56ddb71a8cc67 100644 (file)
--- 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 35df04dad2fd08fec1f16bf19ce28429ffde1713..4a9a3949af45927d3c51bb5a9092c60e89136ffc 100644 (file)
--- 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 3e8394be15aea4fbe3f2d513341c2536b873e883..3e25a6e358be6893e038707d63c3b6eae86cede2 100644 (file)
--- 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/