summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMax Krummenacher <max.krummenacher@toradex.com>2023-11-07 06:08:52 -0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2023-11-09 16:57:26 +0000
commit683aff7a081bb20a36506d93eb98e993c94e3c15 (patch)
treec61758288d0fbb48916fc776a27ed514369f9ff4
parent4a9824a209570d252298dfb33f7e4d3122ca567c (diff)
downloadpoky-683aff7a081bb20a36506d93eb98e993c94e3c15.tar.gz
perf: fix build with latest kernel
Kernel 6.7-rc1 commit 02e85f74668e ("tools: arm64: Add a Makefile for generating sysreg-defs.h") uses files from arch/arm64/tools/, gen-sysreg.awk and sysreg. Without the files the build of perf fails independent of the used architecture (confirmed with armv7 and qemux86_64). As arch/arm64/tools/ has been added with 5.13 allow perf to build even it that directory does not exist. Add arch/arm64/tools/ to PERF_SRC. Fixes: | make[3]: *** No rule to make target '.../qemux86_64-tdx-linux/perf/1.0/perf-1.0/arch/arm64/tools/gen-sysreg.awk', needed by '.../qemux86_64-tdx-linux/perf/1.0/perf-1.0/tools/arch/arm64/include/generated/asm/sysreg-defs.h'. Stop. | make[2]: *** [Makefile.perf:456: arm64-sysreg-defs] Error 2 (From OE-Core rev: 432b4ac20dadb9c08596266fce4f3941d4856c7e) Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-kernel/perf/perf.bb4
1 files changed, 3 insertions, 1 deletions
diff --git a/meta/recipes-kernel/perf/perf.bb b/meta/recipes-kernel/perf/perf.bb
index 5672f7d338..a90acd55ef 100644
--- a/meta/recipes-kernel/perf/perf.bb
+++ b/meta/recipes-kernel/perf/perf.bb
@@ -138,6 +138,7 @@ PERF_SRC ?= "Makefile \
138 tools/perf \ 138 tools/perf \
139 tools/scripts \ 139 tools/scripts \
140 scripts/ \ 140 scripts/ \
141 arch/arm64/tools \
141 arch/${ARCH}/Makefile \ 142 arch/${ARCH}/Makefile \
142" 143"
143 144
@@ -183,7 +184,8 @@ python copy_perf_source_from_kernel() {
183 src = oe.path.join(src_dir, s) 184 src = oe.path.join(src_dir, s)
184 dest = oe.path.join(dest_dir, s) 185 dest = oe.path.join(dest_dir, s)
185 if not os.path.exists(src): 186 if not os.path.exists(src):
186 bb.fatal("Path does not exist: %s. Maybe PERF_SRC does not match the kernel version." % src) 187 bb.warn("Path does not exist: %s. Maybe PERF_SRC lists more files than what your kernel version provides and needs." % src)
188 continue
187 if os.path.isdir(src): 189 if os.path.isdir(src):
188 oe.path.copyhardlinktree(src, dest) 190 oe.path.copyhardlinktree(src, dest)
189 else: 191 else: