From fc899f1e1b407d493228ccb144972828271d0367 Mon Sep 17 00:00:00 2001 From: Max Krummenacher Date: Fri, 12 May 2023 01:22:14 +0200 Subject: perf: add libtraceevent packageconfig With kernel 6.4-rc1 commit 6898e60f709b ("perf build: If libtraceevent isn't present error the build") having libtraceevent is a required dependency unless building it with 'NO_LIBTRACEEVENT=1'. Older kernels did build libtraceevent as provided by the kernel sources. (Unless LIBTRACEEVENT_DYNAMIC=1 was defined, then it tried to pickup an external provided libtraceevent and printed a warning if not found.) Add a libtraceevent packageconfig which adds the dependency on libtraceevent if set, otherwise builds with NO_LIBTRACEEVENT=1. For older kernels the old behaviour of building libtraceevent from the kernel sources isn't changed. (From OE-Core rev: 7e7a7394b47f6fd4a4dd26a18a5d94302ab6df1e) Signed-off-by: Max Krummenacher Signed-off-by: Alexandre Belloni Signed-off-by: Richard Purdie --- meta/recipes-kernel/perf/perf.bb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'meta') diff --git a/meta/recipes-kernel/perf/perf.bb b/meta/recipes-kernel/perf/perf.bb index da5f6533e6..67b01a7f65 100644 --- a/meta/recipes-kernel/perf/perf.bb +++ b/meta/recipes-kernel/perf/perf.bb @@ -11,7 +11,7 @@ LICENSE = "GPL-2.0-only" PR = "r9" -PACKAGECONFIG ??= "scripting tui libunwind" +PACKAGECONFIG ??= "scripting tui libunwind libtraceevent" PACKAGECONFIG[dwarf] = ",NO_DWARF=1" PACKAGECONFIG[scripting] = ",NO_LIBPERL=1 NO_LIBPYTHON=1,perl python3 python3-setuptools-native" # gui support was added with kernel 3.6.35 @@ -27,6 +27,7 @@ PACKAGECONFIG[jvmti] = ",NO_JVMTI=1" PACKAGECONFIG[audit] = ",NO_LIBAUDIT=1,audit" PACKAGECONFIG[manpages] = ",,xmlto-native asciidoc-native" PACKAGECONFIG[cap] = ",,libcap" +PACKAGECONFIG[libtraceevent] = ",NO_LIBTRACEEVENT=1,libtraceevent" # Arm CoreSight PACKAGECONFIG[coresight] = "CORESIGHT=1,,opencsd" -- cgit v1.2.3-54-g00ecf