summaryrefslogtreecommitdiffstats
path: root/meta/recipes-kernel
diff options
context:
space:
mode:
authorMartin Jansa <Martin.Jansa@gmail.com>2020-08-18 18:04:09 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2020-09-02 16:04:37 +0100
commit3546be99157f14925d1be33cc8b6a26729bab4bb (patch)
tree727e363ca9b4e3a02a5fd2ce2cae831cbf483a9d /meta/recipes-kernel
parent16701c536769107e9b9d7c318495c78ce296e989 (diff)
downloadpoky-3546be99157f14925d1be33cc8b6a26729bab4bb.tar.gz
perf: backport a fix for confusing non-fatal error
* add V=1 to make log.do_compile a bit more useful, with this it shows: /bin/sh '/OE/build/oe-core/tmp-glibc/work/qemux86_64-oe-linux/perf/1.0-r9/perf-1.0/tools/perf/trace/beauty/arch_errno_names.sh' x86_64-oe-linux-gcc -m64 -march=core2 -mtune=core2 -msse3 -mfpmath=sse --sysroot=/OE/build/oe-core/tmp-glibc/work/qemux86_64-oe-linux/perf/1.0-r9/recipe-sysroot /OE/build/oe-core/tmp-glibc/work/qemux86_64-oe-linux/perf/1.0-r9/perf-1.0/tools > /OE/build/oe-core/tmp-glibc/work/qemux86_64-oe-linux/perf/1.0-r9/perf-1.0/trace/beauty/generated/arch_errno_name_array.c find: unknown predicate `-m64/arch' x86_64-oe-linux-gcc: error: unrecognized command-line option '-m64/include/uapi/asm-generic/errno.h' x86_64-oe-linux-gcc: fatal error: no input files compilation terminated. x86_64-oe-linux-gcc: error: unrecognized command-line option '-m64/include/uapi/asm-generic/errno.h' x86_64-oe-linux-gcc: fatal error: no input files compilation terminated. * apply https://github.com/torvalds/linux/commit/e4ffd066ff440a57097e9140fa9e16ceef905de8 with sed call to fix this (From OE-Core rev: 5f41726872d751c3bfe784ca14eca9be4a4e3c4b) Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> (cherry picked from commit c603e6e13e44ae907cf1f04abf6e1babf3d7be26) 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.bb4
1 files changed, 4 insertions, 0 deletions
diff --git a/meta/recipes-kernel/perf/perf.bb b/meta/recipes-kernel/perf/perf.bb
index c4b7b77e99..578b871e9e 100644
--- a/meta/recipes-kernel/perf/perf.bb
+++ b/meta/recipes-kernel/perf/perf.bb
@@ -68,6 +68,7 @@ SPDX_S = "${S}/tools/perf"
68LDFLAGS="-ldl -lutil" 68LDFLAGS="-ldl -lutil"
69 69
70EXTRA_OEMAKE = '\ 70EXTRA_OEMAKE = '\
71 V=1 \
71 -C ${S}/tools/perf \ 72 -C ${S}/tools/perf \
72 O=${B} \ 73 O=${B} \
73 CROSS_COMPILE=${TARGET_PREFIX} \ 74 CROSS_COMPILE=${TARGET_PREFIX} \
@@ -199,6 +200,9 @@ do_configure_prepend () {
199 ${S}/tools/perf/Makefile.perf 200 ${S}/tools/perf/Makefile.perf
200 sed -i -e "s,prefix='\$(DESTDIR_SQ)/usr'$,prefix='\$(DESTDIR_SQ)/usr' --install-lib='\$(DESTDIR)\$(PYTHON_SITEPACKAGES_DIR)',g" \ 201 sed -i -e "s,prefix='\$(DESTDIR_SQ)/usr'$,prefix='\$(DESTDIR_SQ)/usr' --install-lib='\$(DESTDIR)\$(PYTHON_SITEPACKAGES_DIR)',g" \
201 ${S}/tools/perf/Makefile.perf 202 ${S}/tools/perf/Makefile.perf
203 # backport https://github.com/torvalds/linux/commit/e4ffd066ff440a57097e9140fa9e16ceef905de8
204 sed -i -e 's,\($(Q)$(SHELL) .$(arch_errno_tbl).\) $(CC) $(arch_errno_hdr_dir),\1 $(firstword $(CC)) $(arch_errno_hdr_dir),g' \
205 ${S}/tools/perf/Makefile.perf
202 fi 206 fi
203 sed -i -e "s,--root='/\$(DESTDIR_SQ)',--prefix='\$(DESTDIR_SQ)/usr' --install-lib='\$(DESTDIR)\$(PYTHON_SITEPACKAGES_DIR)',g" \ 207 sed -i -e "s,--root='/\$(DESTDIR_SQ)',--prefix='\$(DESTDIR_SQ)/usr' --install-lib='\$(DESTDIR)\$(PYTHON_SITEPACKAGES_DIR)',g" \
204 ${S}/tools/perf/Makefile* 208 ${S}/tools/perf/Makefile*