Hi Bruce Thanks for working on this.
On Thu, Apr 4, 2024 at 10:47 PM Bruce Ashfield <[email protected]> wrote: > > From: Bruce Ashfield <[email protected]> > > To keep the perf source copying as small as possible, we can > further refine the arch/uapi copy to the single file that we > currently need. With that design goal in mind I would go with this solution, Tested for an aarch64 target, 6.9-rc2 builds perf for me while before this series it failed. > > To avoid a warning from the general perf source copy routine, > we make the .h conditional based on the architecture. > > The supported architectures will not change often, so updating > this arch list is very minimal effort. Alternatively, we could > add a PERF_OPTIONAL_SRC variable and not warn if a file isn't > available for a given architecture. > > Signed-off-by: Bruce Ashfield <[email protected]> > --- > > This is a further refinement of the perf header that > is required outside of tools. > > I'm trying it this way first, versus making the perf > source copy not warn on missing files, since we risk > skipping warnings we want to see! > > Bruce > > meta/recipes-kernel/perf/perf.bb | 6 ++++-- > 1 file changed, 4 insertions(+), 2 deletions(-) > > diff --git a/meta/recipes-kernel/perf/perf.bb > b/meta/recipes-kernel/perf/perf.bb > index 2f540cd54b..3cc7f63610 100644 > --- a/meta/recipes-kernel/perf/perf.bb > +++ b/meta/recipes-kernel/perf/perf.bb > @@ -129,7 +129,9 @@ EXTRA_OEMAKE += "\ > # honour a JOBS variable. > EXTRA_OEMAKE:append:task-configure = " JOBS=1" > > -# include/uapi/asm is for: include/uapi/asm/bpf_perf_event.h > +# the architectures that need this file can be found in > +# ./tools/include/uapi/asm/bpf_perf_event.h > +PERF_BPF_EVENT_SRC ?= '${@bb.utils.contains_any("ARCH", [ "riscv", "arm64", > "powerpc" ], "arch/${ARCH}/include/uapi/asm/bpf_perf_event.h", "", d)}' s/powerpc/loongarch/ If I get it right from tools/include/uapi/asm/bpf_perf_event.h powerpc is not needed. (I didn't test) However "loongarch" does and seems to be supported in OE. Cheers Max > PERF_SRC ?= "Makefile \ > tools/arch \ > tools/build \ > @@ -140,7 +142,7 @@ PERF_SRC ?= "Makefile \ > tools/scripts \ > scripts/ \ > arch/arm64/tools \ > - arch/${ARCH}/include/uapi/asm/ \ > + ${PERF_BPF_EVENT_SRC} \ > arch/${ARCH}/Makefile \ > " > > -- > 2.39.2 > > > >
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#197984): https://lists.openembedded.org/g/openembedded-core/message/197984 Mute This Topic: https://lists.openembedded.org/mt/105337225/21656 Group Owner: [email protected] Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
