From: Max Krummenacher <max.oss.09@gmail.com>
To: openembedded-core@lists.openembedded.org
Cc: mikko.rapeli@linaro.org, bruce.ashfield@gmail.com,
Max Krummenacher <max.krummenacher@toradex.com>
Subject: [OE-core][Patch v2] perf: fix build with latest kernel
Date: Tue, 7 Nov 2023 06:08:52 -0300 [thread overview]
Message-ID: <20231107090852.1478021-1-max.oss.09@gmail.com> (raw)
From: Max Krummenacher <max.krummenacher@toradex.com>
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
Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
---
meta/recipes-kernel/perf/perf.bb | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
Changes in v2:
- drop distinction between needed and optional files in PERF_SRC
- allow all file paths in PERF_SRC to not exist, but bb.warn about them
diff --git a/meta/recipes-kernel/perf/perf.bb b/meta/recipes-kernel/perf/perf.bb
index a392166e73..287d3e68f7 100644
--- a/meta/recipes-kernel/perf/perf.bb
+++ b/meta/recipes-kernel/perf/perf.bb
@@ -135,6 +135,7 @@ PERF_SRC ?= "Makefile \
tools/perf \
tools/scripts \
scripts/ \
+ arch/arm64/tools \
arch/${ARCH}/Makefile \
"
@@ -180,7 +181,8 @@ python copy_perf_source_from_kernel() {
src = oe.path.join(src_dir, s)
dest = oe.path.join(dest_dir, s)
if not os.path.exists(src):
- bb.fatal("Path does not exist: %s. Maybe PERF_SRC does not match the kernel version." % src)
+ bb.warn("Path does not exist: %s. Maybe PERF_SRC lists more files than what your kernel version provides and needs." % src)
+ continue
if os.path.isdir(src):
oe.path.copyhardlinktree(src, dest)
else:
--
2.35.3
next reply other threads:[~2023-11-07 9:09 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-11-07 9:08 Max Krummenacher [this message]
2023-11-07 13:08 ` [OE-core][Patch v2] perf: fix build with latest kernel Bruce Ashfield
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20231107090852.1478021-1-max.oss.09@gmail.com \
--to=max.oss.09@gmail.com \
--cc=bruce.ashfield@gmail.com \
--cc=max.krummenacher@toradex.com \
--cc=mikko.rapeli@linaro.org \
--cc=openembedded-core@lists.openembedded.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox