From 4a75d478da3bd5cca1f86f6b23afbda5a6c74ac5 Mon Sep 17 00:00:00 2001 From: Bruce Ashfield Date: Mon, 4 Jul 2022 11:13:55 -0400 Subject: perf: fix reproducibility in 5.19+ kernels with upstream commit 630af16eee495f583db5202c3613d1b191f10694 [perf tools: Use Python devtools for version autodetection rather than runtime], or -stable backports of that commmit, evade our substitutions for reproducibility. We add a second sed expression to ensure that our definition of python is used, as we have the proper environement setup and don't need the full path of python, which eventually will be captured by the perf binaries. (From OE-Core rev: b24e73fb34049061ea03a6f2b6a54cdbee7b406b) Signed-off-by: Bruce Ashfield Signed-off-by: Richard Purdie --- meta/recipes-kernel/perf/perf.bb | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'meta/recipes-kernel/perf') diff --git a/meta/recipes-kernel/perf/perf.bb b/meta/recipes-kernel/perf/perf.bb index adefc44eaa..603d3f9eee 100644 --- a/meta/recipes-kernel/perf/perf.bb +++ b/meta/recipes-kernel/perf/perf.bb @@ -228,6 +228,12 @@ do_configure:prepend () { 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 + # likewise with this substitution. Kernels with commit 18f2967418d031a39 + # [perf tools: Use Python devtools for version autodetection rather than runtime] + # need this substitution for reproducibility. + sed -i -e 's,$(call get-executable-or-default\,PYTHON\,$(subst -config\,\,$(PYTHON_AUTO))),$(notdir $(call get-executable-or-default\,PYTHON\,$(subst -config\,\,$(PYTHON_AUTO)))),g' \ + ${S}/tools/perf/Makefile.config + # The following line: # srcdir_SQ = $(patsubst %tools/perf,tools/perf,$(subst ','\'',$(srcdir))), # Captures the full src path of perf, which of course makes it not -- cgit v1.2.3-54-g00ecf