From d7a0fdf133b82289633187400619feec1d0a305e Mon Sep 17 00:00:00 2001 From: Bruce Ashfield Date: Wed, 28 Aug 2019 15:28:40 -0400 Subject: perf: v5.3+ build fixes 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. (From OE-Core rev: b850ee597e7116cc2a7546853f2b976c891196ef) Signed-off-by: Bruce Ashfield Signed-off-by: Richard Purdie --- meta/recipes-kernel/perf/perf.bb | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'meta/recipes-kernel/perf') diff --git a/meta/recipes-kernel/perf/perf.bb b/meta/recipes-kernel/perf/perf.bb index af0410c88d..7f00df0f8e 100644 --- a/meta/recipes-kernel/perf/perf.bb +++ b/meta/recipes-kernel/perf/perf.bb @@ -242,6 +242,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 + + # 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() { -- cgit v1.2.3-54-g00ecf