[oe-commits] [openembedded-core] 08/17: perf: make sure that the tools/include/uapi/asm-generic directory exists

git at git.openembedded.org git at git.openembedded.org
Wed May 15 16:54:01 UTC 2019


This is an automated email from the git hooks/post-receive script.

rpurdie pushed a commit to branch master
in repository openembedded-core.

commit 5fdb96f4996856286c4f72b93d31b7990ceed8aa
Author: Martin Jansa <martin.jansa at gmail.com>
AuthorDate: Tue May 14 07:30:30 2019 +0000

    perf: make sure that the tools/include/uapi/asm-generic directory exists
    
    * before trying to copy unistd.h into it
    
    * older kernels don't have uapi in tools/include and do_configure fails
      with:
      DEBUG: Executing shell function do_configure
      cp: cannot create regular file '.../perf/1.0-r9/perf-1.0/tools/include/uapi/asm-generic/unistd.h':
      No such file or directory
      WARNING: exit code 1 from a shell command.
    
    * tools/include/uapi was added in kernel 4.8 with
      https://github.com/torvalds/linux/commit/c4b6014e8bb0c8d47fe5c71ebc604f31091e5d3f
      tools: Add copy of perf_event.h to tools/include/linux/
    
    Signed-off-by: Martin Jansa <Martin.Jansa at gmail.com>
    Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
 meta/recipes-kernel/perf/perf.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/recipes-kernel/perf/perf.bb b/meta/recipes-kernel/perf/perf.bb
index 546076f..4e603f1 100644
--- a/meta/recipes-kernel/perf/perf.bb
+++ b/meta/recipes-kernel/perf/perf.bb
@@ -238,7 +238,7 @@ 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
-    cp ${STAGING_INCDIR}/asm-generic/unistd.h ${S}/tools/include/uapi/asm-generic/unistd.h
+    install -D -m0644 ${STAGING_INCDIR}/asm-generic/unistd.h ${S}/tools/include/uapi/asm-generic/unistd.h
 }
 
 python do_package_prepend() {

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.


More information about the Openembedded-commits mailing list