Skip to contentSkip to conversation

perf: Add /scripts to sources

PATCH In review Daniel Díaz 2 participants 4 messages Oct 24, 2019 – Nov 15, 2019

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 perf: Add /scripts to sources

As of linux-next-20191022, we need bpf_helpers_doc.py in order to
build libbpf, which lives in /scripts. Otherwise, do_compile fails
with:
| /bin/sh: 1: /oe/build/tmp/work/machine-triplet/perf/1.0-r9/perf-1.0/scripts/bpf_helpers_doc.py: not found | Makefile:184: recipe for target 'bpf_helper_defs.h' failed

See commit e01a75c159691 ("libbpf: Move bpf_{helpers, helper_defs, endian, tracing}.h into libbpf") from linux-next.

---
 meta/recipes-kernel/perf/perf.bb | 1 +
 1 file changed, 1 insertion(+)
meta/recipes-kernel/perf/perf.bb +1 -0
index 8201c0cb60..a463eebc52 100644
@@ -113,6 +113,7 @@ PERF_SRC ?= "Makefile \
              tools/Makefile \
              tools/perf \
              tools/scripts \
+             scripts \
 "
 
 PERF_EXTRA_LDFLAGS = ""
Signature · 1 line
2.20.1
#1 lore raw

Hello!

Quoted 27 lines · Daniel Díaz

As of linux-next-20191022, we need bpf_helpers_doc.py in order to
build libbpf, which lives in /scripts. Otherwise, do_compile fails
with:
| /bin/sh: 1: /oe/build/tmp/work/machine-triplet/perf/1.0-r9/perf-1.0/scripts/bpf_helpers_doc.py: not found | Makefile:184: recipe for target 'bpf_helper_defs.h' failed

See commit e01a75c159691 ("libbpf: Move bpf_{helpers, helper_defs, endian, tracing}.h into libbpf") from linux-next.

---
 meta/recipes-kernel/perf/perf.bb | 1 +
 1 file changed, 1 insertion(+)
meta/recipes-kernel/perf/perf.bb +1 -1
index 8201c0cb60..a463eebc52 100644
@@ -113,6 +113,7 @@ PERF_SRC ?= "Makefile \
              tools/Makefile \
              tools/perf \
              tools/scripts \
+             scripts \
 "
 
 PERF_EXTRA_LDFLAGS = ""
--
Quoted 1 line

2.20.1

Ping.

Daniel Díaz
[email protected]

#2 lore raw
Quoted 29 lines · Daniel Díaz

Hello!

Quoted 25 lines · Daniel Díaz

As of linux-next-20191022, we need bpf_helpers_doc.py in order to
build libbpf, which lives in /scripts. Otherwise, do_compile fails
with:
| /bin/sh: 1: /oe/build/tmp/work/machine-triplet/perf/1.0-r9/perf-1.0/scripts/bpf_helpers_doc.py: not found | Makefile:184: recipe for target 'bpf_helper_defs.h' failed

See commit e01a75c159691 ("libbpf: Move bpf_{helpers, helper_defs, endian, tracing}.h into libbpf") from linux-next.

---
 meta/recipes-kernel/perf/perf.bb | 1 +
 1 file changed, 1 insertion(+)
meta/recipes-kernel/perf/perf.bb +1 -0
index 8201c0cb60..a463eebc52 100644
@@ -113,6 +113,7 @@ PERF_SRC ?= "Makefile \
              tools/Makefile \
              tools/perf \
              tools/scripts \
+             scripts \
 "
 
Quoted 5 lines
Quoted 3 lines
meta/recipes-kernel/perf/perf.bb +0 -1
 PERF_EXTRA_LDFLAGS = ""
--

2.20.1

Ping.

I just went through trying to reduce the amount of source that we copy for perf, since it has often ended up causing us maintenance pain.

Can we just copy the one script we need, versus a complete copy of the directory ?

My patch from a few weeks ago, makes it safe to copy a single file, so it should be doable.

Cheers,

Bruce

Quoted 8 lines

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

Signature · 3 lines
- Thou shalt not follow the NULL pointer, for chaos and madness await
thee at its end
- "Use the force Harry" - Gandalf, Star Trek II
#3 lore raw

Hello!

Quoted 33 lines · Bruce Ashfield
Quoted 26 lines · Daniel Díaz
Quoted 25 lines · Daniel Díaz

As of linux-next-20191022, we need bpf_helpers_doc.py in order to
build libbpf, which lives in /scripts. Otherwise, do_compile fails
with:
| /bin/sh: 1: /oe/build/tmp/work/machine-triplet/perf/1.0-r9/perf-1.0/scripts/bpf_helpers_doc.py: not found | Makefile:184: recipe for target 'bpf_helper_defs.h' failed

See commit e01a75c159691 ("libbpf: Move bpf_{helpers, helper_defs, endian, tracing}.h into libbpf") from linux-next.

---
 meta/recipes-kernel/perf/perf.bb | 1 +
 1 file changed, 1 insertion(+)
meta/recipes-kernel/perf/perf.bb +1 -0
index 8201c0cb60..a463eebc52 100644
@@ -113,6 +113,7 @@ PERF_SRC ?= "Makefile \
              tools/Makefile \
              tools/perf \
              tools/scripts \
+             scripts \
 "
 
Quoted 5 lines
Quoted 3 lines
meta/recipes-kernel/perf/perf.bb +0 -1
 PERF_EXTRA_LDFLAGS = ""
--

2.20.1

Ping.

Quoted 8 lines

I just went through trying to reduce the amount of source that we copy for perf, since it has often ended up causing us maintenance pain.

Can we just copy the one script we need, versus a complete copy of the directory ?

My patch from a few weeks ago, makes it safe to copy a single file, so it should be doable.

I am unable to test that as I'm still stuck on Sumo. I can confirm that "scripts/bpf_helpers_doc.py" doesn't work in such an old version, whereas "scripts" does.

Thanks and greetings!

Daniel Díaz
[email protected]