From 4ad361341c17cc5df20b6ec36975f901d19f5f67 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Fri, 3 Feb 2023 16:49:51 +0000 Subject: [PATCH] perf: Enable debug/source packaging This was disabled in 2014[1] due to an error message which as far as I can tell, no longer occurs. Having debug information and source files present will make debugging reproducibility issues much easier so remove this line as it appears no longer needed. Fix up a few files which have buildpaths in them to avoid QA warnings and reproducubility issues. [1] OE-Core revision c1b5a262c0201faf2c6bf545d6acb32dfe383ba3 (From OE-Core rev: c1f148fa51c541bd806376f5eec93fd348e87583) Signed-off-by: Richard Purdie (cherry picked from commit 95983108121c8b96f5659d110498bf2afc6189d9) Signed-off-by: Steve Sakoman Signed-off-by: Richard Purdie --- meta/recipes-kernel/perf/perf.bb | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/meta/recipes-kernel/perf/perf.bb b/meta/recipes-kernel/perf/perf.bb index c1b0bd22d8..4088c67662 100644 --- a/meta/recipes-kernel/perf/perf.bb +++ b/meta/recipes-kernel/perf/perf.bb @@ -356,6 +356,16 @@ FILES:${PN}-python = " \ " FILES:${PN}-perl = "${libexecdir}/perf-core/scripts/perl" - -INHIBIT_PACKAGE_DEBUG_SPLIT="1" DEBUG_OPTIMIZATION:append = " -Wno-error=maybe-uninitialized" + +PACKAGESPLITFUNCS =+ "perf_fix_sources" + +perf_fix_sources () { + for f in util/parse-events-flex.h util/parse-events-flex.c util/pmu-flex.c \ + util/expr-flex.h util/expr-flex.c; do + f=${PKGD}/usr/src/debug/${PN}/${EXTENDPE}${PV}-${PR}/$f + if [ -e $f ]; then + sed -i -e 's#${S}/##g' $f + fi + done +}