From 08e5948ba83ab7fd332bb5e794d7a4610aeba59d Mon Sep 17 00:00:00 2001 From: Joel Stanley Date: Mon, 3 Feb 2020 14:22:00 +1030 Subject: perf: Additional fixes for 5.5+ In e5c4f3127521 ("perf: fix build for v5.5+") the recipe was fixed for 5.5 kernels. Testing shows that perf's build system also uses a file from the scripts/ directory to generate a bpf header, so this must be added to the list of files to perform a replace on. Additioanlly the replacement would run on all occurances of /usr/bin/python first, resulting in lines that contained "/usr/bin/env python32". This re-orders the sed lines to avoid that. This fixes warnings such the following: File "/usr/lib/python3.6/sysconfig.py", line 421, in _init_posix _temp = __import__(name, globals(), locals(), ['build_time_vars'], 0) ModuleNotFoundError: No module named '_sysconfigdata' Signed-off-by: Joel Stanley Change-Id: I8d0011908c87d5fbcf1c3aefb362fe6beb64d22e --- poky/meta/recipes-kernel/perf/perf.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'poky') diff --git a/poky/meta/recipes-kernel/perf/perf.bb b/poky/meta/recipes-kernel/perf/perf.bb index 840f3008b..070d5ecab 100644 --- a/poky/meta/recipes-kernel/perf/perf.bb +++ b/poky/meta/recipes-kernel/perf/perf.bb @@ -237,11 +237,11 @@ do_configure_prepend () { fi # use /usr/bin/env instead of version specific python - for s in `find ${S}/tools/perf/ -name '*.py'`; do - sed -i 's,/usr/bin/python,/usr/bin/env python3,' "${s}" + for s in `find ${S}/tools/perf/ -name '*.py'` scripts/bpf_helpers_doc.py; do sed -i 's,/usr/bin/python2,/usr/bin/env python3,' "${s}" sed -i 's,/usr/bin/env python2,/usr/bin/env python3,' "${s}" sed -i 's,/usr/bin/python3,/usr/bin/env python3,' "${s}" + sed -i 's,/usr/bin/python,/usr/bin/env python3,' "${s}" done # unistd.h can be out of sync between libc-headers and the captured version in the perf source -- cgit v1.2.3