summaryrefslogtreecommitdiffstats
path: root/meta/recipes-kernel/perf/perf.bb
diff options
context:
space:
mode:
authorBruce Ashfield <bruce.ashfield@gmail.com>2019-10-21 16:16:18 -0400
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-11-04 13:39:04 +0000
commit2f9b303ed4339046f06fcef71777ec4b0f0fae75 (patch)
tree69ac7a51e61de45fc632d07f90942f4d363e520d /meta/recipes-kernel/perf/perf.bb
parenta2b0925e104c7e90c3c64d3ad2556570b9d6d869 (diff)
downloadpoky-2f9b303ed4339046f06fcef71777ec4b0f0fae75.tar.gz
perf: drop 'include' copy
The copy of the kernel's top level include directory is not required to build perf. We have both the linux-libc-headers and perf's captured/copied headers for what it requires. The copy of the kernel's headers is leading us to multiple smaller fixes to ensure that the various .h files are in sync. We can remove the copy and all of the sync checks, and perf still builds and executes correctly. (From OE-Core rev: 79bfd5515887e5faf315a581d98bda63899760da) 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/recipes-kernel/perf/perf.bb')
-rw-r--r--meta/recipes-kernel/perf/perf.bb9
1 files changed, 0 insertions, 9 deletions
diff --git a/meta/recipes-kernel/perf/perf.bb b/meta/recipes-kernel/perf/perf.bb
index 191305969c..5f0ba7c180 100644
--- a/meta/recipes-kernel/perf/perf.bb
+++ b/meta/recipes-kernel/perf/perf.bb
@@ -106,7 +106,6 @@ EXTRA_OEMAKE += "\
106EXTRA_OEMAKE_append_task-configure = " JOBS=1" 106EXTRA_OEMAKE_append_task-configure = " JOBS=1"
107 107
108PERF_SRC ?= "Makefile \ 108PERF_SRC ?= "Makefile \
109 include \
110 tools/arch \ 109 tools/arch \
111 tools/build \ 110 tools/build \
112 tools/include \ 111 tools/include \
@@ -248,14 +247,6 @@ do_configure_prepend () {
248 # so we copy it from the sysroot unistd.h to the perf unistd.h 247 # so we copy it from the sysroot unistd.h to the perf unistd.h
249 install -D -m0644 ${STAGING_INCDIR}/asm-generic/unistd.h ${S}/tools/include/uapi/asm-generic/unistd.h 248 install -D -m0644 ${STAGING_INCDIR}/asm-generic/unistd.h ${S}/tools/include/uapi/asm-generic/unistd.h
250 install -D -m0644 ${STAGING_INCDIR}/asm-generic/unistd.h ${S}/include/uapi/asm-generic/unistd.h 249 install -D -m0644 ${STAGING_INCDIR}/asm-generic/unistd.h ${S}/include/uapi/asm-generic/unistd.h
251
252 # bits.h can have the same issue as unistd.h, so we make the tools variant take precedence
253 [ -e ${S}/tools/include/linux/bits.h ] && install -D -m0644 ${S}/tools/include/linux/bits.h ${S}/include/linux/bits.h
254
255 [ -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
256
257 [ -e ${S}/include/uapi/linux/kvm.h ] && install -D -m0644 ${S}/include/uapi/linux/kvm.h ${S}/tools/include/uapi/linux/kvm.h
258 [ -e ${S}/include/uapi/linux/sched.h ] && install -D -m0644 ${S}/include/uapi/linux/sched.h ${S}/tools/include/uapi/linux/sched.h
259} 250}
260 251
261python do_package_prepend() { 252python do_package_prepend() {