From 8650a98b270b769f869fe796828083ff00463bb1 Mon Sep 17 00:00:00 2001 From: Max Krummenacher Date: Thu, 4 Apr 2024 16:47:01 -0400 Subject: 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 Signed-off-by: Bruce Ashfield Signed-off-by: Richard Purdie --- meta/recipes-kernel/perf/perf.bb | 2 ++ 1 file changed, 2 insertions(+) (limited to 'meta/recipes-kernel') 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 += "\ # honour a JOBS variable. EXTRA_OEMAKE:append:task-configure = " JOBS=1" +# include/uapi/asm is for: include/uapi/asm/bpf_perf_event.h PERF_SRC ?= "Makefile \ tools/arch \ tools/build \ @@ -139,6 +140,7 @@ PERF_SRC ?= "Makefile \ tools/scripts \ scripts/ \ arch/arm64/tools \ + arch/${ARCH}/include/uapi/asm/ \ arch/${ARCH}/Makefile \ " -- cgit v1.2.3-54-g00ecf