Skip to contentSkip to conversation

perf: make sure that the tools/include/uapi/asm-generic directory exists

PATCH Superseded Martin Jansa 2 participants 5 messages May 11, 2019 – May 14, 2019

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 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/

---
 meta/recipes-kernel/perf/perf.bb | 1 +
 1 file changed, 1 insertion(+)
meta/recipes-kernel/perf/perf.bb +1 -0
index 546076f84b..215d0a38f9 100644
@@ -238,6 +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
+    [ -d ${S}/tools/include/uapi/asm-generic/ ] || mkdir -p ${S}/tools/include/uapi/asm-generic/
     cp ${STAGING_INCDIR}/asm-generic/unistd.h ${S}/tools/include/uapi/asm-generic/unistd.h
 }
 
Signature · 1 line
2.17.1
#1 lore raw
Quoted 24 lines · Martin Jansa

* 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/

---
 meta/recipes-kernel/perf/perf.bb | 1 +
 1 file changed, 1 insertion(+)
meta/recipes-kernel/perf/perf.bb +0 -0
index 546076f84b..215d0a38f9 100644

meta/recipes-kernel/perf/perf.bb do_configure_prepend () { · line 242

Quoted 5 lines
meta/recipes-kernel/perf/perf.bb +1 -0
@@ -238,6 +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
+    [ -d ${S}/tools/include/uapi/asm-generic/ ] || mkdir -p ${S}/tools/include/uapi/asm-generic/
     cp ${STAGING_INCDIR}/asm-generic/unistd.h ${S}/tools/include/uapi/asm-generic/unistd.h

you can also use
install -D 0644 ${STAGING_INCDIR}/asm-generic/unistd.h ${S}/tools/include/uapi/asm-generic/unistd.h and get both done is one call.

Quoted 10 lines
meta/recipes-kernel/perf/perf.bb +0 -1
 }
 
--

2.17.1

--
_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-core

#2 lore raw

PATCH v2 1/1 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/

---
 meta/recipes-kernel/perf/perf.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-kernel/perf/perf.bb +1 -1
index 546076f84b..774894166c 100644
@@ -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 0644 ${STAGING_INCDIR}/asm-generic/unistd.h ${S}/tools/include/uapi/asm-generic/unistd.h
 }
 
 python do_package_prepend() {
Signature · 1 line
2.17.1
#3 lore raw

I'm sorry, will need v3.

install: target 'lib32-perf/1.0-r9/perf-1.0/tools/include/uapi/asm-generic/unistd.h' is not a directory

Quoted 41 lines · Martin Jansa

* 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/

---
 meta/recipes-kernel/perf/perf.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-kernel/perf/ renamed from meta/recipes-kernel/perf/perf.bb +0 -0

perf.bb
index 546076f84b..774894166c 100644

meta/recipes-kernel/perf/perf.bb +0 -0
@@ -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 0644 ${STAGING_INCDIR}/asm-generic/unistd.h
${S}/tools/include/uapi/asm-generic/unistd.h
 }

python do_package_prepend() {
--
2.17.1

#4 lore raw

PATCH v3 1/1 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/

---
 meta/recipes-kernel/perf/perf.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-kernel/perf/perf.bb +1 -1
index 546076f84b..4e603f1a32 100644
@@ -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() {
Signature · 1 line
2.17.1