[OE-core] [PATCH 6/8] perf: v5.3+ build fixes

Bruce Ashfield bruce.ashfield at gmail.com
Thu Aug 29 00:32:09 UTC 2019


On Wed, Aug 28, 2019 at 3:28 PM <bruce.ashfield at gmail.com> wrote:
>
> From: Bruce Ashfield <bruce.ashfield at gmail.com>
>
> In the 5.3+ perf builds, there are multiple unistd.h files that need
> to be kept in sync. So not only do we update one, we update both to
> ensure that libc-headers and the perf build are in sync.
>
> perf checks some key files itself to be sure they are in sync, and
> bits.h can be out of sync. There's no build error that results with
> bits.h at the moment, but we still make sure they are in sync to
> avoid the configure/compile warning.
>
> Signed-off-by: Bruce Ashfield <bruce.ashfield at gmail.com>
> ---
>  meta/recipes-kernel/perf/perf.bb | 4 ++++
>  1 file changed, 4 insertions(+)
>
> diff --git a/meta/recipes-kernel/perf/perf.bb b/meta/recipes-kernel/perf/perf.bb
> index 8ac8e7c308..58543c73d8 100644
> --- a/meta/recipes-kernel/perf/perf.bb
> +++ b/meta/recipes-kernel/perf/perf.bb
> @@ -241,6 +241,10 @@ do_configure_prepend () {
>      # unistd.h can be out of sync between libc-headers and the captured version in the perf source
>      # 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
> +

I just realized this may not be safe across all the kernel versions.
I'll submit a new version (if required), after I've tested my python3
changes to perf.

Cheers,

Bruce

> +    # bits.h can have the same issuen as unistd.h, so we make the tools variant take precedence
> +    install -D -m0644 ${S}/tools/include/linux/bits.h ${S}/include/linux/bits.h
>  }
>
>  python do_package_prepend() {
> --
> 2.19.1
>


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


More information about the Openembedded-core mailing list