From: Bruce Ashfield <[email protected]> The following upstream commit:
commit 44b44ffd5dcef03d273ad070d0b02a65a323f5f6 Author: Leo Yan <[email protected]> Date: Sun Dec 15 22:12:22 2024 +0000 perf build: Minor improvement for linking libzstd The zstd library will be automatically linked by detecting the feature libzstd. It is no need to explicitly link it for static builds, so remove the redundant linkage. It is contradictory to detect the feature libelf-zstd while the build configuration NO_LIBZSTD is set. Report an error for reminding users not to set NO_LIBZSTD. Signed-off-by: Leo Yan <[email protected]> Tested-by: Namhyung Kim <[email protected]> Acked-by: Andrii Nakryiko <[email protected]> Cc: Adrian Hunter <[email protected]> Cc: Alexei Starovoitov <[email protected]> Cc: Daniel Borkmann <[email protected]> Cc: Eduard Zingerman <[email protected]> Cc: Guilherme Amadio <[email protected]> Cc: Hao Luo <[email protected]> Cc: Ian Rogers <[email protected]> Cc: James Clark <[email protected]> Cc: Jiri Olsa <[email protected]> Cc: John Fastabend <[email protected]> Cc: KP Singh <[email protected]> Cc: Kan Liang <[email protected]> Cc: Martin KaFai Lau <[email protected]> Cc: Nick Terrell <[email protected]> Cc: Quentin Monnet <[email protected]> Cc: Song Liu <[email protected]> Cc: Stanislav Fomichev <[email protected]> Cc: Yonghong Song <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Arnaldo Carvalho de Melo <[email protected]> Enforces that zstd must be enabled if libelfstd is detected. Our build of perf and the other default features lead to libelf-zstd being detected, and hence the build aborts when the features are checked. We can't condionally enable this for 6.14+ kernels due to the way that the perf recipe works. The feature is minor and probably should have already been in the defaults. To keep things simple, we just enable it and will watch for any fallout. Signed-off-by: Bruce Ashfield <[email protected]> --- meta/recipes-kernel/perf/perf.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/recipes-kernel/perf/perf.bb b/meta/recipes-kernel/perf/perf.bb index 18e2454f9a..d06dd2fa5a 100644 --- a/meta/recipes-kernel/perf/perf.bb +++ b/meta/recipes-kernel/perf/perf.bb @@ -9,8 +9,8 @@ HOMEPAGE = "https://perf.wiki.kernel.org/index.php/Main_Page"; LICENSE = "GPL-2.0-only" - -PACKAGECONFIG ??= "python tui libunwind libtraceevent" +# zstd is required for kernels 6.14+ when libelf-zstd is detected +PACKAGECONFIG ??= "python tui libunwind libtraceevent zstd" PACKAGECONFIG[dwarf] = ",NO_DWARF=1" PACKAGECONFIG[perl] = ",NO_LIBPERL=1,perl" PACKAGECONFIG[python] = ",NO_LIBPYTHON=1,python3 python3-setuptools-native" -- 2.39.2
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#211915): https://lists.openembedded.org/g/openembedded-core/message/211915 Mute This Topic: https://lists.openembedded.org/mt/111379271/21656 Group Owner: [email protected] Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
