[OE-core] [PATCH 6/6] perf: drop 'include' copy

[Bruce Ashfield]

On Mon, Oct 21, 2019 at 4:24 PM Martin Jansa <martin.jansa at gmail.com> wrote:
>
> On Mon, Oct 21, 2019 at 04:16:18PM -0400, bruce.ashfield at gmail.com wrote:
> > From: Bruce Ashfield <bruce.ashfield at gmail.com>
> >
> > The copy of the kernel's top level include directory is not
> > required to build perf. We have both the linux-libc-headers and
> > perf's captured/copied headers for what it requires.
> >
> > The copy of the kernel's headers is leading us to multiple smaller
> > fixes to ensure that the various .h files are in sync. We can
> > remove the copy and all of the sync checks, and perf still builds
> > and executes correctly.
>
> Maybe reorder this before "[OE-core] [PATCH 3/6] perf: fix v5.4+ builds"
> as it removes most of what was possibly incorrectly added there (see 2nd
> review)
>

I left this here on purpose, since it is only RFC. The other patches
as they appear in the series are required to build against 5.4+, but
this is optional.

Bruce

> > Signed-off-by: Bruce Ashfield <bruce.ashfield at gmail.com>
> > ---
> >  meta/recipes-kernel/perf/perf.bb | 9 ---------
> >  1 file changed, 9 deletions(-)
> >
> > diff --git a/meta/recipes-kernel/perf/perf.bb b/meta/recipes-kernel/perf/perf.bb
> > index 191305969c..5f0ba7c180 100644
> > --- a/meta/recipes-kernel/perf/perf.bb
> > +++ b/meta/recipes-kernel/perf/perf.bb
> > @@ -106,7 +106,6 @@ EXTRA_OEMAKE += "\
> >  EXTRA_OEMAKE_append_task-configure = " JOBS=1"
> >
> >  PERF_SRC ?= "Makefile \
> > -             include \
> >               tools/arch \
> >               tools/build \
> >               tools/include \
> > @@ -248,14 +247,6 @@ do_configure_prepend () {
> >      # so we copy it from the sysroot unistd.h to the perf unistd.h
> >      install -D -m0644 ${STAGING_INCDIR}/asm-generic/unistd.h ${S}/tools/include/uapi/asm-generic/unistd.h
> >      install -D -m0644 ${STAGING_INCDIR}/asm-generic/unistd.h ${S}/include/uapi/asm-generic/unistd.h
> > -
> > -    # bits.h can have the same issue as unistd.h, so we make the tools variant take precedence
> > -    [ -e ${S}/tools/include/linux/bits.h ] && install -D -m0644 ${S}/tools/include/linux/bits.h ${S}/include/linux/bits.h
> > -
> > -    [ -e ${S}/tools/perf/util/include/linux/ctype.h ] && install -D -m0644 ${S}/include/linux/ctype.h ${S}/tools/perf/util/include/linux/ctype.h
> > -
> > -    [ -e ${S}/include/uapi/linux/kvm.h ] && install -D -m0644 ${S}/include/uapi/linux/kvm.h  ${S}/tools/include/uapi/linux/kvm.h
> > -    [ -e ${S}/include/uapi/linux/sched.h ] && install -D -m0644 ${S}/include/uapi/linux/sched.h  ${S}/tools/include/uapi/linux/sched.h
> >  }
> >
> >  python do_package_prepend() {
> > --
> > 2.19.1
> >
> > --
> > _______________________________________________
> > Openembedded-core mailing list
> > Openembedded-core at lists.openembedded.org
> > http://lists.openembedded.org/mailman/listinfo/openembedded-core
>
> --
> Martin 'JaMa' Jansa     jabber: Martin.Jansa at gmail.com



-- 
- Thou shalt not follow the NULL pointer, for chaos and madness await
thee at its end
- "Use the force Harry" - Gandalf, Star Trek II