[OE-core] [PATCH] perf: Add /scripts to sources

[Daniel Díaz]

Hello!

On Mon, 4 Nov 2019 at 17:42, Bruce Ashfield <bruce.ashfield at gmail.com> wrote:
> On Mon, Nov 4, 2019 at 5:56 PM Daniel Díaz <daniel.diaz at linaro.org> wrote:
> > On Thu, 24 Oct 2019 at 13:34, Daniel Díaz <daniel.diaz at linaro.org> wrote:
> > > As of linux-next-20191022, we need bpf_helpers_doc.py in order to
> > > build libbpf, which lives in /scripts. Otherwise, do_compile fails
> > > with:
> > > | /bin/sh: 1: /oe/build/tmp/work/machine-triplet/perf/1.0-r9/perf-1.0/scripts/bpf_helpers_doc.py: not found
> > > | Makefile:184: recipe for target 'bpf_helper_defs.h' failed
> > >
> > > See commit e01a75c159691 ("libbpf: Move bpf_{helpers, helper_defs,
> > > endian, tracing}.h into libbpf") from linux-next.
> > >
> > > Signed-off-by: Daniel Díaz <daniel.diaz at linaro.org>
> > > ---
> > >  meta/recipes-kernel/perf/perf.bb | 1 +
> > >  1 file changed, 1 insertion(+)
> > >
> > > diff --git a/meta/recipes-kernel/perf/perf.bb b/meta/recipes-kernel/perf/perf.bb
> > > index 8201c0cb60..a463eebc52 100644
> > > --- a/meta/recipes-kernel/perf/perf.bb
> > > +++ b/meta/recipes-kernel/perf/perf.bb
> > > @@ -113,6 +113,7 @@ PERF_SRC ?= "Makefile \
> > >               tools/Makefile \
> > >               tools/perf \
> > >               tools/scripts \
> > > +             scripts \
> > >  "
> > >
> > >  PERF_EXTRA_LDFLAGS = ""
> > > --
> > > 2.20.1
> >
> > Ping.
>
> I just went through trying to reduce the amount of source that we copy
> for perf, since it has often ended up causing us maintenance pain.
>
> Can we just copy the one script we need, versus a complete copy of the
> directory ?
>
> My patch from a few weeks ago, makes it safe to copy a single file, so
> it should be doable.

I am unable to test that as I'm still stuck on Sumo. I can confirm
that "scripts/bpf_helpers_doc.py" doesn't work in such an old version,
whereas "scripts" does.

Thanks and greetings!

Daniel Díaz
daniel.diaz at linaro.org