From a4326da742c41f69c2d1d49cc8fdc2fda74aaa0d Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Wed, 20 Jul 2022 17:08:52 +0100 Subject: perf: fix reproduciblity in older releases of Linux If you build perf from Linux 5.4 it still contains buildpaths (pointing to the sysroot's Python) as the existing fixes don't apply to the lines in that old release. Add further expressions to remove the final buildpaths. Signed-off-by: Ross Burton Signed-off-by: Alexandre Belloni Signed-off-by: Richard Purdie (cherry picked from commit 6783c1e295e5afafd73a02fd986ca8956a89dda7) Signed-off-by: Steve Sakoman --- meta/recipes-kernel/perf/perf.bb | 3 +++ 1 file changed, 3 insertions(+) (limited to 'meta/recipes-kernel') diff --git a/meta/recipes-kernel/perf/perf.bb b/meta/recipes-kernel/perf/perf.bb index 603d3f9eee..95e7eae9fe 100644 --- a/meta/recipes-kernel/perf/perf.bb +++ b/meta/recipes-kernel/perf/perf.bb @@ -227,6 +227,9 @@ do_configure:prepend () { # reproducible. sed -i -e 's,$(call get-executable-or-default\,PYTHON\,$(PYTHON_AUTO)),$(notdir $(call get-executable-or-default\,PYTHON\,$(PYTHON_AUTO))),g' \ ${S}/tools/perf/Makefile.config + # The same line is in older releases, but looking explicitly for Python 2 + sed -i -e 's,$(call get-executable-or-default\,PYTHON\,$(PYTHON2)),$(notdir $(call get-executable-or-default\,PYTHON\,$(PYTHON2))),g' \ + ${S}/tools/perf/Makefile.config # likewise with this substitution. Kernels with commit 18f2967418d031a39 # [perf tools: Use Python devtools for version autodetection rather than runtime] -- cgit 1.2.3-korg