summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBruce Ashfield <bruce.ashfield@gmail.com>2020-01-13 04:41:23 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2020-08-04 22:17:38 (GMT)
commit92f184e213040517280991e22a84a2c5fc19149d (patch)
tree5d0b11601ae4304156b44493eb968717907af960
parentb9d6ffc341a54cab7b2b828520250b0bd124ebaa (diff)
downloadpoky-92f184e213040517280991e22a84a2c5fc19149d.tar.gz
perf: fix build for v5.5+
In kernel 5.5+ there are python3 scripts that explicitly use /usr/bin/python3 as the interpreter. That will find the host python and produce undefined results. We add that interpreter path to our substitutions to ensure that our sysroot variant is used. (From OE-Core rev: 103316d50d4947b3c3500eb5cbc4845702a62d22) (From OE-Core rev: 3269e3d2d0258ac3788ed63fa46df4d4aae33b1e) Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> (cherry picked from commit e5c4f3127521607742f7cdf62481b64cf4d3e828) Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-kernel/perf/perf.bb1
1 files changed, 1 insertions, 0 deletions
diff --git a/meta/recipes-kernel/perf/perf.bb b/meta/recipes-kernel/perf/perf.bb
index 90f05c0..d707b58 100644
--- a/meta/recipes-kernel/perf/perf.bb
+++ b/meta/recipes-kernel/perf/perf.bb
@@ -237,6 +237,7 @@ do_configure_prepend () {
237 sed -i 's,/usr/bin/python,/usr/bin/env python3,' "${s}" 237 sed -i 's,/usr/bin/python,/usr/bin/env python3,' "${s}"
238 sed -i 's,/usr/bin/python2,/usr/bin/env python3,' "${s}" 238 sed -i 's,/usr/bin/python2,/usr/bin/env python3,' "${s}"
239 sed -i 's,/usr/bin/env python2,/usr/bin/env python3,' "${s}" 239 sed -i 's,/usr/bin/env python2,/usr/bin/env python3,' "${s}"
240 sed -i 's,/usr/bin/python3,/usr/bin/env python3,' "${s}"
240 done 241 done
241 242
242 # unistd.h can be out of sync between libc-headers and the captured version in the perf source 243 # unistd.h can be out of sync between libc-headers and the captured version in the perf source