From f35bf272e4b83bf1b9e2e1e9fb4bb1ce28c5e27f Mon Sep 17 00:00:00 2001
From: Bruce Ashfield <bruce.ashfield@gmail.com>
Date: Tue, 25 Feb 2025 10:56:47 -0500
Subject: [PATCH] perf: enable zstd in default PACKAGECONFIG

The following upstream commit:

  commit 44b44ffd5dcef03d273ad070d0b02a65a323f5f6
  Author: Leo Yan <leo.yan@arm.com>
  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 <leo.yan@arm.com>
      Tested-by: Namhyung Kim <namhyung@kernel.org>
      Acked-by: Andrii Nakryiko <andrii@kernel.org>
      Cc: Adrian Hunter <adrian.hunter@intel.com>
      Cc: Alexei Starovoitov <ast@kernel.org>
      Cc: Daniel Borkmann <daniel@iogearbox.net>
      Cc: Eduard Zingerman <eddyz87@gmail.com>
      Cc: Guilherme Amadio <amadio@gentoo.org>
      Cc: Hao Luo <haoluo@google.com>
      Cc: Ian Rogers <irogers@google.com>
      Cc: James Clark <james.clark@linaro.org>
      Cc: Jiri Olsa <jolsa@kernel.org>
      Cc: John Fastabend <john.fastabend@gmail.com>
      Cc: KP Singh <kpsingh@kernel.org>
      Cc: Kan Liang <kan.liang@linux.intel.com>
      Cc: Martin KaFai Lau <martin.lau@linux.dev>
      Cc: Nick Terrell <terrelln@fb.com>
      Cc: Quentin Monnet <qmo@kernel.org>
      Cc: Song Liu <song@kernel.org>
      Cc: Stanislav Fomichev <sdf@google.com>
      Cc: Yonghong Song <yonghong.song@linux.dev>
      Link: https://lore.kernel.org/r/20241215221223.293205-3-leo.yan@arm.com
      Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

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.

(From OE-Core rev: c1b44f4e9f7d13673a93aa81be6a3e11aa9f742b)

Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
Signed-off-by: Mathieu Dubois-Briand <mathieu.dubois-briand@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
 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"