summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorBruce Ashfield <bruce.ashfield@gmail.com>2019-10-21 16:16:15 -0400
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-11-04 13:39:04 +0000
commit2c6f4206405dfdc93a38c081ff2975eb07e0f480 (patch)
treede7e04d56612161d8fdc3ee363aa980e5b82a752 /meta
parent28b50773223ed1c985dc694f0470e01e3266e09a (diff)
downloadpoky-2c6f4206405dfdc93a38c081ff2975eb07e0f480.tar.gz
perf: fix v5.4+ builds
When building perf for 5.4+, we have some new files that need to be copied (and synchronized) due to structural changes in the kernel source tree. Some of the issues these fixes are warnings, but none the less, they are worth fixing. - We copy arch/${ARCH}/Makefile, since it is source by some perf Makefiles - We copy scripts/, since the perf utilities are looking for files in that directory stucture. - We have *three* copies of ctypes.h in the tools/* hierarchy during the build. If the tools/perf/util/include/linux/ variant is used, it will trigger build errors since it is not complete. We copy the kernel's main include/linux/ctype.h to ensure they are in sync. (From OE-Core rev: 6a000d734c2fe57b4a601fe7e7373096345b02b4) Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-kernel/perf/perf.bb7
1 files changed, 7 insertions, 0 deletions
diff --git a/meta/recipes-kernel/perf/perf.bb b/meta/recipes-kernel/perf/perf.bb
index 8201c0cb60..0f5df74f11 100644
--- a/meta/recipes-kernel/perf/perf.bb
+++ b/meta/recipes-kernel/perf/perf.bb
@@ -113,6 +113,8 @@ PERF_SRC ?= "Makefile \
113 tools/Makefile \ 113 tools/Makefile \
114 tools/perf \ 114 tools/perf \
115 tools/scripts \ 115 tools/scripts \
116 scripts/ \
117 arch/${ARCH}/Makefile \
116" 118"
117 119
118PERF_EXTRA_LDFLAGS = "" 120PERF_EXTRA_LDFLAGS = ""
@@ -246,6 +248,11 @@ do_configure_prepend () {
246 248
247 # bits.h can have the same issue as unistd.h, so we make the tools variant take precedence 249 # bits.h can have the same issue as unistd.h, so we make the tools variant take precedence
248 [ -e ${S}/tools/include/linux/bits.h ] && install -D -m0644 ${S}/tools/include/linux/bits.h ${S}/include/linux/bits.h 250 [ -e ${S}/tools/include/linux/bits.h ] && install -D -m0644 ${S}/tools/include/linux/bits.h ${S}/include/linux/bits.h
251
252 [ -e ${S}/tools/perf/util/include/linux/ctype.h ] && install -D -m0644 ${S}/include/linux/ctype.h ${S}/tools/perf/util/include/linux/ctype.h
253
254 [ -e ${S}/include/uapi/linux/kvm.h ] && install -D -m0644 ${S}/include/uapi/linux/kvm.h ${S}/tools/include/uapi/linux/kvm.h
255 [ -e ${S}/include/uapi/linux/sched.h ] && install -D -m0644 ${S}/include/uapi/linux/sched.h ${S}/tools/include/uapi/linux/sched.h
249} 256}
250 257
251python do_package_prepend() { 258python do_package_prepend() {