summaryrefslogtreecommitdiffstats
path: root/meta/recipes-kernel
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2022-08-11 14:27:36 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2022-08-28 07:51:30 +0100
commit6cde70a085799e547034886563b518a093df5614 (patch)
tree6227f566d22671a3f4668149b15d101cb1c91abd /meta/recipes-kernel
parent2900394c894bd872c95c58bbc45e81ca6597729e (diff)
downloadpoky-6cde70a085799e547034886563b518a093df5614.tar.gz
perf: Fix reproducibility issues with 5.19 onwards
In 5.19 onwards the build process changed and encoded full build paths into the output. Adapt the code to look more like our setuptools class calls. This seems to work ok with older kernels too. (From OE-Core rev: 6d1bedab94e5ffa1b6fefcf181b09fcf4127bdc7) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> (cherry picked from commit 138673f833a72c636a7fa185089f25dda350dc54) Signed-off-by: Steve Sakoman <steve@sakoman.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-kernel')
-rw-r--r--meta/recipes-kernel/perf/perf.bb2
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/recipes-kernel/perf/perf.bb b/meta/recipes-kernel/perf/perf.bb
index 95e7eae9fe..95b4362958 100644
--- a/meta/recipes-kernel/perf/perf.bb
+++ b/meta/recipes-kernel/perf/perf.bb
@@ -203,7 +203,7 @@ do_configure:prepend () {
203 if [ -e "${S}/tools/perf/Makefile.perf" ]; then 203 if [ -e "${S}/tools/perf/Makefile.perf" ]; then
204 sed -i -e 's,\ .config-detected, $(OUTPUT)/config-detected,g' \ 204 sed -i -e 's,\ .config-detected, $(OUTPUT)/config-detected,g' \
205 ${S}/tools/perf/Makefile.perf 205 ${S}/tools/perf/Makefile.perf
206 sed -i -e "s,prefix='\$(DESTDIR_SQ)/usr'$,prefix='\$(DESTDIR_SQ)/usr' --install-lib='\$(DESTDIR)\$(PYTHON_SITEPACKAGES_DIR)',g" \ 206 sed -i -e "s,prefix='\$(DESTDIR_SQ)/usr'$,prefix='\$(DESTDIR_SQ)/usr' --install-lib='\$(PYTHON_SITEPACKAGES_DIR)' --root='\$(DESTDIR)',g" \
207 ${S}/tools/perf/Makefile.perf 207 ${S}/tools/perf/Makefile.perf
208 # backport https://github.com/torvalds/linux/commit/e4ffd066ff440a57097e9140fa9e16ceef905de8 208 # backport https://github.com/torvalds/linux/commit/e4ffd066ff440a57097e9140fa9e16ceef905de8
209 sed -i -e 's,\($(Q)$(SHELL) .$(arch_errno_tbl).\) $(CC) $(arch_errno_hdr_dir),\1 $(firstword $(CC)) $(arch_errno_hdr_dir),g' \ 209 sed -i -e 's,\($(Q)$(SHELL) .$(arch_errno_tbl).\) $(CC) $(arch_errno_hdr_dir),\1 $(firstword $(CC)) $(arch_errno_hdr_dir),g' \