diff options
author | Max Krummenacher <max.krummenacher@toradex.com> | 2024-04-04 16:47:01 -0400 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2024-04-08 23:33:32 +0100 |
commit | 8650a98b270b769f869fe796828083ff00463bb1 (patch) | |
tree | eefa2c8a7fca944e4a01ee139c3d7d79bbdf3d0c /meta | |
parent | 2a8994a58cf3de7849e8b66596ea414df55b1ae9 (diff) | |
download | poky-8650a98b270b769f869fe796828083ff00463bb1.tar.gz |
perf: add asm include required for v6.9+
Kernel commit 9eea8fafe33e ("libbpf: fix __arg_ctx type enforcement for
perf_event programs") added with 6.9-rc1 tools/include/uapi/asm/bpf_perf_event.h
which for arc, arm64, loongarch, riscv and s390 includes headers from
the arch/${ARCH}/... directories.
Which results in:
ERROR: perf-1.0-r0 do_compile: oe_runmake failed
| In file included from 1.0/perf-1.0/tools/include/uapi/linux/bpf_perf_event.h:11,
| from libbpf.c:36:
| perf/1.0/perf-1.0/tools/include/uapi/asm/bpf_perf_event.h:2:10: fatal error: ../../arch/arm64/include/uapi/asm/bpf_perf_event.h: No such file or directory
| 2 | #include "../../arch/arm64/include/uapi/asm/bpf_perf_event.h"
| | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
We copy the uapi/asm directory to make sure the header file is
present.
(From OE-Core rev: d92e04c1cebd7d29a767d5862b713fa97d3e5d8e)
Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r-- | meta/recipes-kernel/perf/perf.bb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/meta/recipes-kernel/perf/perf.bb b/meta/recipes-kernel/perf/perf.bb index 6c4ee4a208..fe96e1012b 100644 --- a/meta/recipes-kernel/perf/perf.bb +++ b/meta/recipes-kernel/perf/perf.bb | |||
@@ -129,6 +129,7 @@ EXTRA_OEMAKE += "\ | |||
129 | # honour a JOBS variable. | 129 | # honour a JOBS variable. |
130 | EXTRA_OEMAKE:append:task-configure = " JOBS=1" | 130 | EXTRA_OEMAKE:append:task-configure = " JOBS=1" |
131 | 131 | ||
132 | # include/uapi/asm is for: include/uapi/asm/bpf_perf_event.h | ||
132 | PERF_SRC ?= "Makefile \ | 133 | PERF_SRC ?= "Makefile \ |
133 | tools/arch \ | 134 | tools/arch \ |
134 | tools/build \ | 135 | tools/build \ |
@@ -139,6 +140,7 @@ PERF_SRC ?= "Makefile \ | |||
139 | tools/scripts \ | 140 | tools/scripts \ |
140 | scripts/ \ | 141 | scripts/ \ |
141 | arch/arm64/tools \ | 142 | arch/arm64/tools \ |
143 | arch/${ARCH}/include/uapi/asm/ \ | ||
142 | arch/${ARCH}/Makefile \ | 144 | arch/${ARCH}/Makefile \ |
143 | " | 145 | " |
144 | 146 | ||