* [PATCH 1/6] tools lib api: clean up install_headers
2022-11-17 0:43 [PATCH 0/6] Build output clean up Ian Rogers
@ 2022-11-17 0:43 ` Ian Rogers
2022-11-17 0:43 ` [PATCH 2/6] tools lib bpf: Avoid install_headers make warning Ian Rogers
` (5 subsequent siblings)
6 siblings, 0 replies; 10+ messages in thread
From: Ian Rogers @ 2022-11-17 0:43 UTC (permalink / raw)
To: Alexei Starovoitov, Daniel Borkmann, Andrii Nakryiko,
Martin KaFai Lau, Song Liu, Yonghong Song, John Fastabend,
KP Singh, Stanislav Fomichev, Hao Luo, Jiri Olsa, Peter Zijlstra,
Ingo Molnar, Arnaldo Carvalho de Melo, Mark Rutland,
Alexander Shishkin, Namhyung Kim, Nicolas Schier, Masahiro Yamada,
Ian Rogers, linux-kernel, bpf, linux-perf-users
Cc: Stephane Eranian
Add missing backslash that caused an install command to always appear
in build output. Make the install headers more specific.
Signed-off-by: Ian Rogers <irogers@google.com>
---
tools/lib/api/Makefile | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/tools/lib/api/Makefile b/tools/lib/api/Makefile
index 3e5ef1e0e890..3649c7f7ea65 100644
--- a/tools/lib/api/Makefile
+++ b/tools/lib/api/Makefile
@@ -100,12 +100,12 @@ install_lib: $(LIBFILE)
cp -fpR $(LIBFILE) $(DESTDIR)$(libdir_SQ)
install_headers:
- $(call QUIET_INSTALL, headers) \
+ $(call QUIET_INSTALL, libapi_headers) \
$(call do_install,cpu.h,$(prefix)/include/api,644); \
$(call do_install,debug.h,$(prefix)/include/api,644); \
$(call do_install,io.h,$(prefix)/include/api,644); \
$(call do_install,fd/array.h,$(prefix)/include/api/fd,644); \
- $(call do_install,fs/fs.h,$(prefix)/include/api/fs,644);
+ $(call do_install,fs/fs.h,$(prefix)/include/api/fs,644); \
$(call do_install,fs/tracing_path.h,$(prefix)/include/api/fs,644);
install: install_lib install_headers
--
2.38.1.431.g37b22c650d-goog
^ permalink raw reply related [flat|nested] 10+ messages in thread* [PATCH 2/6] tools lib bpf: Avoid install_headers make warning
2022-11-17 0:43 [PATCH 0/6] Build output clean up Ian Rogers
2022-11-17 0:43 ` [PATCH 1/6] tools lib api: clean up install_headers Ian Rogers
@ 2022-11-17 0:43 ` Ian Rogers
2022-11-17 0:43 ` [PATCH 3/6] tools lib symbol: clean up build output Ian Rogers
` (4 subsequent siblings)
6 siblings, 0 replies; 10+ messages in thread
From: Ian Rogers @ 2022-11-17 0:43 UTC (permalink / raw)
To: Alexei Starovoitov, Daniel Borkmann, Andrii Nakryiko,
Martin KaFai Lau, Song Liu, Yonghong Song, John Fastabend,
KP Singh, Stanislav Fomichev, Hao Luo, Jiri Olsa, Peter Zijlstra,
Ingo Molnar, Arnaldo Carvalho de Melo, Mark Rutland,
Alexander Shishkin, Namhyung Kim, Nicolas Schier, Masahiro Yamada,
Ian Rogers, linux-kernel, bpf, linux-perf-users
Cc: Stephane Eranian
The perf build makes the install_headers target, however, as there is
no action for this target a warning is always produced of:
make[3]: Nothing to be done for 'install_headers'.
Solve this by adding a display of 'INSTALL libbpf_headers'.
Signed-off-by: Ian Rogers <irogers@google.com>
---
tools/lib/bpf/Makefile | 1 +
1 file changed, 1 insertion(+)
diff --git a/tools/lib/bpf/Makefile b/tools/lib/bpf/Makefile
index 4c904ef0b47e..7f5f7d2ebe1f 100644
--- a/tools/lib/bpf/Makefile
+++ b/tools/lib/bpf/Makefile
@@ -255,6 +255,7 @@ $(INSTALL_GEN_HDRS): $(INSTALL_PFX)/%.h: $(OUTPUT)%.h
$(call do_install,$<,$(prefix)/include/bpf,644)
install_headers: $(BPF_GENERATED) $(INSTALL_SRC_HDRS) $(INSTALL_GEN_HDRS)
+ $(call QUIET_INSTALL, libbpf_headers)
install_pkgconfig: $(PC_FILE)
$(call QUIET_INSTALL, $(PC_FILE)) \
--
2.38.1.431.g37b22c650d-goog
^ permalink raw reply related [flat|nested] 10+ messages in thread* [PATCH 3/6] tools lib symbol: clean up build output
2022-11-17 0:43 [PATCH 0/6] Build output clean up Ian Rogers
2022-11-17 0:43 ` [PATCH 1/6] tools lib api: clean up install_headers Ian Rogers
2022-11-17 0:43 ` [PATCH 2/6] tools lib bpf: Avoid install_headers make warning Ian Rogers
@ 2022-11-17 0:43 ` Ian Rogers
2022-11-17 0:43 ` [PATCH 4/6] tools lib perf: Make install_headers clearer Ian Rogers
` (3 subsequent siblings)
6 siblings, 0 replies; 10+ messages in thread
From: Ian Rogers @ 2022-11-17 0:43 UTC (permalink / raw)
To: Alexei Starovoitov, Daniel Borkmann, Andrii Nakryiko,
Martin KaFai Lau, Song Liu, Yonghong Song, John Fastabend,
KP Singh, Stanislav Fomichev, Hao Luo, Jiri Olsa, Peter Zijlstra,
Ingo Molnar, Arnaldo Carvalho de Melo, Mark Rutland,
Alexander Shishkin, Namhyung Kim, Nicolas Schier, Masahiro Yamada,
Ian Rogers, linux-kernel, bpf, linux-perf-users
Cc: Stephane Eranian
Missing @ when building libsymbol. Make the install echo specific to
installing the libsymbol headers.
Signed-off-by: Ian Rogers <irogers@google.com>
---
tools/lib/symbol/Makefile | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/tools/lib/symbol/Makefile b/tools/lib/symbol/Makefile
index 4c1d6b53032d..ea8707b3442a 100644
--- a/tools/lib/symbol/Makefile
+++ b/tools/lib/symbol/Makefile
@@ -77,7 +77,7 @@ include $(srctree)/tools/scripts/Makefile.include
all: fixdep $(LIBFILE)
$(SYMBOL_IN): FORCE
- $(MAKE) $(build)=libsymbol V=1
+ @$(MAKE) $(build)=libsymbol
$(LIBFILE): $(SYMBOL_IN)
$(QUIET_AR)$(RM) $@ && $(AR) rcs $@ $(SYMBOL_IN)
@@ -101,7 +101,7 @@ install_lib: $(LIBFILE)
cp -fpR $(LIBFILE) $(DESTDIR)$(libdir_SQ)
install_headers:
- $(call QUIET_INSTALL, headers) \
+ $(call QUIET_INSTALL, libsymbol_headers) \
$(call do_install,kallsyms.h,$(prefix)/include/symbol,644);
install: install_lib install_headers
--
2.38.1.431.g37b22c650d-goog
^ permalink raw reply related [flat|nested] 10+ messages in thread* [PATCH 4/6] tools lib perf: Make install_headers clearer
2022-11-17 0:43 [PATCH 0/6] Build output clean up Ian Rogers
` (2 preceding siblings ...)
2022-11-17 0:43 ` [PATCH 3/6] tools lib symbol: clean up build output Ian Rogers
@ 2022-11-17 0:43 ` Ian Rogers
2022-11-17 0:43 ` [PATCH 5/6] tools lib subcmd: " Ian Rogers
` (2 subsequent siblings)
6 siblings, 0 replies; 10+ messages in thread
From: Ian Rogers @ 2022-11-17 0:43 UTC (permalink / raw)
To: Alexei Starovoitov, Daniel Borkmann, Andrii Nakryiko,
Martin KaFai Lau, Song Liu, Yonghong Song, John Fastabend,
KP Singh, Stanislav Fomichev, Hao Luo, Jiri Olsa, Peter Zijlstra,
Ingo Molnar, Arnaldo Carvalho de Melo, Mark Rutland,
Alexander Shishkin, Namhyung Kim, Nicolas Schier, Masahiro Yamada,
Ian Rogers, linux-kernel, bpf, linux-perf-users
Cc: Stephane Eranian
Add libperf to the name so that this install_headers build appears
different to similar targets in different libraries.
Signed-off-by: Ian Rogers <irogers@google.com>
---
tools/lib/perf/Makefile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tools/lib/perf/Makefile b/tools/lib/perf/Makefile
index 1badc0a04676..a90fb8c6bed4 100644
--- a/tools/lib/perf/Makefile
+++ b/tools/lib/perf/Makefile
@@ -188,7 +188,7 @@ install_lib: libs
cp -fpR $(LIBPERF_ALL) $(DESTDIR)$(libdir_SQ)
install_headers:
- $(call QUIET_INSTALL, headers) \
+ $(call QUIET_INSTALL, libperf_headers) \
$(call do_install,include/perf/bpf_perf.h,$(prefix)/include/perf,644); \
$(call do_install,include/perf/core.h,$(prefix)/include/perf,644); \
$(call do_install,include/perf/cpumap.h,$(prefix)/include/perf,644); \
--
2.38.1.431.g37b22c650d-goog
^ permalink raw reply related [flat|nested] 10+ messages in thread* [PATCH 5/6] tools lib subcmd: Make install_headers clearer
2022-11-17 0:43 [PATCH 0/6] Build output clean up Ian Rogers
` (3 preceding siblings ...)
2022-11-17 0:43 ` [PATCH 4/6] tools lib perf: Make install_headers clearer Ian Rogers
@ 2022-11-17 0:43 ` Ian Rogers
2022-11-17 0:43 ` [PATCH 6/6] tools lib traceevent: " Ian Rogers
2022-11-17 15:40 ` [PATCH 0/6] Build output clean up Arnaldo Carvalho de Melo
6 siblings, 0 replies; 10+ messages in thread
From: Ian Rogers @ 2022-11-17 0:43 UTC (permalink / raw)
To: Alexei Starovoitov, Daniel Borkmann, Andrii Nakryiko,
Martin KaFai Lau, Song Liu, Yonghong Song, John Fastabend,
KP Singh, Stanislav Fomichev, Hao Luo, Jiri Olsa, Peter Zijlstra,
Ingo Molnar, Arnaldo Carvalho de Melo, Mark Rutland,
Alexander Shishkin, Namhyung Kim, Nicolas Schier, Masahiro Yamada,
Ian Rogers, linux-kernel, bpf, linux-perf-users
Cc: Stephane Eranian
Add libsubcmd to the name so that this install_headers build appears
different to similar targets in different libraries.
Signed-off-by: Ian Rogers <irogers@google.com>
---
tools/lib/subcmd/Makefile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tools/lib/subcmd/Makefile b/tools/lib/subcmd/Makefile
index e96566f8991c..9a316d8b89df 100644
--- a/tools/lib/subcmd/Makefile
+++ b/tools/lib/subcmd/Makefile
@@ -101,7 +101,7 @@ install_lib: $(LIBFILE)
cp -fpR $(LIBFILE) $(DESTDIR)$(libdir_SQ)
install_headers:
- $(call QUIET_INSTALL, headers) \
+ $(call QUIET_INSTALL, libsubcmd_headers) \
$(call do_install,exec-cmd.h,$(prefix)/include/subcmd,644); \
$(call do_install,help.h,$(prefix)/include/subcmd,644); \
$(call do_install,pager.h,$(prefix)/include/subcmd,644); \
--
2.38.1.431.g37b22c650d-goog
^ permalink raw reply related [flat|nested] 10+ messages in thread* [PATCH 6/6] tools lib traceevent: Make install_headers clearer
2022-11-17 0:43 [PATCH 0/6] Build output clean up Ian Rogers
` (4 preceding siblings ...)
2022-11-17 0:43 ` [PATCH 5/6] tools lib subcmd: " Ian Rogers
@ 2022-11-17 0:43 ` Ian Rogers
2022-11-17 15:40 ` [PATCH 0/6] Build output clean up Arnaldo Carvalho de Melo
6 siblings, 0 replies; 10+ messages in thread
From: Ian Rogers @ 2022-11-17 0:43 UTC (permalink / raw)
To: Alexei Starovoitov, Daniel Borkmann, Andrii Nakryiko,
Martin KaFai Lau, Song Liu, Yonghong Song, John Fastabend,
KP Singh, Stanislav Fomichev, Hao Luo, Jiri Olsa, Peter Zijlstra,
Ingo Molnar, Arnaldo Carvalho de Melo, Mark Rutland,
Alexander Shishkin, Namhyung Kim, Nicolas Schier, Masahiro Yamada,
Ian Rogers, linux-kernel, bpf, linux-perf-users
Cc: Stephane Eranian
Add libtraceevent to the name so that this install_headers build
appears different to similar targets in different libraries. Add ;
after kbuffer.h install target for consistency.
Signed-off-by: Ian Rogers <irogers@google.com>
---
tools/lib/traceevent/Makefile | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/tools/lib/traceevent/Makefile b/tools/lib/traceevent/Makefile
index c874c017c636..98dfd4badea3 100644
--- a/tools/lib/traceevent/Makefile
+++ b/tools/lib/traceevent/Makefile
@@ -234,11 +234,11 @@ install_pkgconfig:
$(call do_install_pkgconfig_file,$(prefix))
install_headers:
- $(call QUIET_INSTALL, headers) \
+ $(call QUIET_INSTALL, traceevent_headers) \
$(call do_install,event-parse.h,$(includedir_SQ),644); \
$(call do_install,event-utils.h,$(includedir_SQ),644); \
$(call do_install,trace-seq.h,$(includedir_SQ),644); \
- $(call do_install,kbuffer.h,$(includedir_SQ),644)
+ $(call do_install,kbuffer.h,$(includedir_SQ),644);
install: install_lib
--
2.38.1.431.g37b22c650d-goog
^ permalink raw reply related [flat|nested] 10+ messages in thread* Re: [PATCH 0/6] Build output clean up
2022-11-17 0:43 [PATCH 0/6] Build output clean up Ian Rogers
` (5 preceding siblings ...)
2022-11-17 0:43 ` [PATCH 6/6] tools lib traceevent: " Ian Rogers
@ 2022-11-17 15:40 ` Arnaldo Carvalho de Melo
2022-11-17 19:32 ` Andrii Nakryiko
6 siblings, 1 reply; 10+ messages in thread
From: Arnaldo Carvalho de Melo @ 2022-11-17 15:40 UTC (permalink / raw)
To: Ian Rogers, Andrii Nakryiko
Cc: Alexei Starovoitov, Daniel Borkmann, Martin KaFai Lau, Song Liu,
Yonghong Song, John Fastabend, KP Singh, Stanislav Fomichev,
Hao Luo, Jiri Olsa, Peter Zijlstra, Ingo Molnar, Mark Rutland,
Alexander Shishkin, Namhyung Kim, Nicolas Schier, Masahiro Yamada,
linux-kernel, bpf, linux-perf-users, Stephane Eranian
Em Wed, Nov 16, 2022 at 04:43:50PM -0800, Ian Rogers escreveu:
> Reduce build spam from commands not prefixed with @. Make
> install_headers targets distinguishable by adding in the library name
> so:
> INSTALL headers
> becomes:
> INSTALL libapi_headers
>
> Ian Rogers (6):
> tools lib api: clean up install_headers
> tools lib bpf: Avoid install_headers make warning
> tools lib symbol: clean up build output
> tools lib perf: Make install_headers clearer
> tools lib subcmd: Make install_headers clearer
> tools lib traceevent: Make install_headers clearer
Andrii, are you ok with that? Can I carry this on my next (perf/core)
branch?
Testing it now.
- Arnaldo
> tools/lib/api/Makefile | 4 ++--
> tools/lib/bpf/Makefile | 1 +
> tools/lib/perf/Makefile | 2 +-
> tools/lib/subcmd/Makefile | 2 +-
> tools/lib/symbol/Makefile | 4 ++--
> tools/lib/traceevent/Makefile | 4 ++--
> 6 files changed, 9 insertions(+), 8 deletions(-)
>
> --
> 2.38.1.431.g37b22c650d-goog
--
- Arnaldo
^ permalink raw reply [flat|nested] 10+ messages in thread* Re: [PATCH 0/6] Build output clean up
2022-11-17 15:40 ` [PATCH 0/6] Build output clean up Arnaldo Carvalho de Melo
@ 2022-11-17 19:32 ` Andrii Nakryiko
2022-11-17 20:12 ` Arnaldo Carvalho de Melo
0 siblings, 1 reply; 10+ messages in thread
From: Andrii Nakryiko @ 2022-11-17 19:32 UTC (permalink / raw)
To: Arnaldo Carvalho de Melo
Cc: Ian Rogers, Andrii Nakryiko, Alexei Starovoitov, Daniel Borkmann,
Martin KaFai Lau, Song Liu, Yonghong Song, John Fastabend,
KP Singh, Stanislav Fomichev, Hao Luo, Jiri Olsa, Peter Zijlstra,
Ingo Molnar, Mark Rutland, Alexander Shishkin, Namhyung Kim,
Nicolas Schier, Masahiro Yamada, linux-kernel, bpf,
linux-perf-users, Stephane Eranian
On Thu, Nov 17, 2022 at 7:40 AM Arnaldo Carvalho de Melo
<acme@kernel.org> wrote:
>
> Em Wed, Nov 16, 2022 at 04:43:50PM -0800, Ian Rogers escreveu:
> > Reduce build spam from commands not prefixed with @. Make
> > install_headers targets distinguishable by adding in the library name
> > so:
> > INSTALL headers
> > becomes:
> > INSTALL libapi_headers
> >
> > Ian Rogers (6):
> > tools lib api: clean up install_headers
> > tools lib bpf: Avoid install_headers make warning
> > tools lib symbol: clean up build output
> > tools lib perf: Make install_headers clearer
> > tools lib subcmd: Make install_headers clearer
> > tools lib traceevent: Make install_headers clearer
>
> Andrii, are you ok with that? Can I carry this on my next (perf/core)
> branch?
yep, lgtm. Please take it through your tree, in-kernel Makefile is not
even synced into Github, so there is no downsides in terms of libbpf
sync.
Acked-by: Andrii Nakryiko <andrii@kernel.org>
>
> Testing it now.
>
> - Arnaldo
>
> > tools/lib/api/Makefile | 4 ++--
> > tools/lib/bpf/Makefile | 1 +
> > tools/lib/perf/Makefile | 2 +-
> > tools/lib/subcmd/Makefile | 2 +-
> > tools/lib/symbol/Makefile | 4 ++--
> > tools/lib/traceevent/Makefile | 4 ++--
> > 6 files changed, 9 insertions(+), 8 deletions(-)
> >
> > --
> > 2.38.1.431.g37b22c650d-goog
>
> --
>
> - Arnaldo
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH 0/6] Build output clean up
2022-11-17 19:32 ` Andrii Nakryiko
@ 2022-11-17 20:12 ` Arnaldo Carvalho de Melo
0 siblings, 0 replies; 10+ messages in thread
From: Arnaldo Carvalho de Melo @ 2022-11-17 20:12 UTC (permalink / raw)
To: Andrii Nakryiko
Cc: Ian Rogers, Andrii Nakryiko, Alexei Starovoitov, Daniel Borkmann,
Martin KaFai Lau, Song Liu, Yonghong Song, John Fastabend,
KP Singh, Stanislav Fomichev, Hao Luo, Jiri Olsa, Peter Zijlstra,
Ingo Molnar, Mark Rutland, Alexander Shishkin, Namhyung Kim,
Nicolas Schier, Masahiro Yamada, linux-kernel, bpf,
linux-perf-users, Stephane Eranian
Em Thu, Nov 17, 2022 at 11:32:10AM -0800, Andrii Nakryiko escreveu:
> On Thu, Nov 17, 2022 at 7:40 AM Arnaldo Carvalho de Melo
> <acme@kernel.org> wrote:
> >
> > Em Wed, Nov 16, 2022 at 04:43:50PM -0800, Ian Rogers escreveu:
> > > Reduce build spam from commands not prefixed with @. Make
> > > install_headers targets distinguishable by adding in the library name
> > > so:
> > > INSTALL headers
> > > becomes:
> > > INSTALL libapi_headers
> > >
> > > Ian Rogers (6):
> > > tools lib api: clean up install_headers
> > > tools lib bpf: Avoid install_headers make warning
> > > tools lib symbol: clean up build output
> > > tools lib perf: Make install_headers clearer
> > > tools lib subcmd: Make install_headers clearer
> > > tools lib traceevent: Make install_headers clearer
> >
> > Andrii, are you ok with that? Can I carry this on my next (perf/core)
> > branch?
>
> yep, lgtm. Please take it through your tree, in-kernel Makefile is not
> even synced into Github, so there is no downsides in terms of libbpf
> sync.
>
> Acked-by: Andrii Nakryiko <andrii@kernel.org>
Thanks, done.
- Arnaldo
^ permalink raw reply [flat|nested] 10+ messages in thread