* [PATCH] perf install: Don't propagate subdir to Documentation submake
@ 2024-05-23 8:06 Nicolas Schier
2024-07-03 14:46 ` Nicolas Schier
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: Nicolas Schier @ 2024-05-23 8:06 UTC (permalink / raw)
To: Peter Zijlstra, Ingo Molnar, Arnaldo Carvalho de Melo,
Namhyung Kim, Mark Rutland, Alexander Shishkin, Jiri Olsa,
Ian Rogers, Adrian Hunter
Cc: Nicolas Schier, linux-perf-users, linux-kernel,
Uwe Kleine-König
Explicitly reset 'subdir' variable when descending to
tools/perf/Documentation. Similar to commit f89fb55714b62 ("perf build:
Don't propagate subdir to submakes for install_headers", 2023-01-02),
calling the 'tools/perf_install' target via top-levels Makefile results
in repeated subdir components when attempting to call the perf
documentation installation rules:
$ make tools/perf_install NO_LIBTRACEEVENT=1 JOBS=1
[...]
/bin/sh: 1: cd: can't cd to /data/linux/kbuild/tools/perf/tools/perf/
../../scripts/Makefile.include:17: *** output directory "/data/linux/kbuild/tools/perf/tools/perf/" does not exist. Stop.
make[5]: *** [Makefile.perf:1096: try-install-man] Error 2
make[4]: *** [Makefile.perf:264: sub-make] Error 2
make[3]: *** [Makefile:113: install] Error 2
make[2]: *** [Makefile:131: perf_install] Error 2
Resetting 'subdir' fixes the call from top-level Makefile.
Reported-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Signed-off-by: Nicolas Schier <n.schier@avm.de>
---
tools/perf/Makefile.perf | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tools/perf/Makefile.perf b/tools/perf/Makefile.perf
index 5c35c0d893069..ab15d199e3794 100644
--- a/tools/perf/Makefile.perf
+++ b/tools/perf/Makefile.perf
@@ -1093,7 +1093,7 @@ install-python_ext:
# 'make install-doc' should call 'make -C Documentation install'
$(INSTALL_DOC_TARGETS):
- $(Q)$(MAKE) -C $(DOC_DIR) O=$(OUTPUT) $(@:-doc=) ASCIIDOC_EXTRA=$(ASCIIDOC_EXTRA)
+ $(Q)$(MAKE) -C $(DOC_DIR) O=$(OUTPUT) $(@:-doc=) ASCIIDOC_EXTRA=$(ASCIIDOC_EXTRA) subdir=
### Cleaning rules
---
base-commit: 29c73fc794c83505066ee6db893b2a83ac5fac63
change-id: 20240523-make-tools-perf-install-71c3d1f11ffc
Best regards,
--
Nicolas Schier
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH] perf install: Don't propagate subdir to Documentation submake
2024-05-23 8:06 [PATCH] perf install: Don't propagate subdir to Documentation submake Nicolas Schier
@ 2024-07-03 14:46 ` Nicolas Schier
2024-07-03 15:54 ` Uwe Kleine-König
2024-07-04 20:00 ` Namhyung Kim
2 siblings, 0 replies; 4+ messages in thread
From: Nicolas Schier @ 2024-07-03 14:46 UTC (permalink / raw)
To: Peter Zijlstra, Ingo Molnar, Arnaldo Carvalho de Melo,
Namhyung Kim, Mark Rutland, Alexander Shishkin, Jiri Olsa,
Ian Rogers, Adrian Hunter
Cc: linux-perf-users, linux-kernel, Uwe Kleine-König
On Thu, May 23, 2024 at 10:06:40AM +0200, Nicolas Schier wrote:
> Explicitly reset 'subdir' variable when descending to
> tools/perf/Documentation. Similar to commit f89fb55714b62 ("perf build:
> Don't propagate subdir to submakes for install_headers", 2023-01-02),
> calling the 'tools/perf_install' target via top-levels Makefile results
> in repeated subdir components when attempting to call the perf
> documentation installation rules:
>
> $ make tools/perf_install NO_LIBTRACEEVENT=1 JOBS=1
> [...]
> /bin/sh: 1: cd: can't cd to /data/linux/kbuild/tools/perf/tools/perf/
> ../../scripts/Makefile.include:17: *** output directory "/data/linux/kbuild/tools/perf/tools/perf/" does not exist. Stop.
> make[5]: *** [Makefile.perf:1096: try-install-man] Error 2
> make[4]: *** [Makefile.perf:264: sub-make] Error 2
> make[3]: *** [Makefile:113: install] Error 2
> make[2]: *** [Makefile:131: perf_install] Error 2
>
> Resetting 'subdir' fixes the call from top-level Makefile.
>
> Reported-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
> Signed-off-by: Nicolas Schier <n.schier@avm.de>
> ---
> tools/perf/Makefile.perf | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/tools/perf/Makefile.perf b/tools/perf/Makefile.perf
> index 5c35c0d893069..ab15d199e3794 100644
> --- a/tools/perf/Makefile.perf
> +++ b/tools/perf/Makefile.perf
> @@ -1093,7 +1093,7 @@ install-python_ext:
>
> # 'make install-doc' should call 'make -C Documentation install'
> $(INSTALL_DOC_TARGETS):
> - $(Q)$(MAKE) -C $(DOC_DIR) O=$(OUTPUT) $(@:-doc=) ASCIIDOC_EXTRA=$(ASCIIDOC_EXTRA)
> + $(Q)$(MAKE) -C $(DOC_DIR) O=$(OUTPUT) $(@:-doc=) ASCIIDOC_EXTRA=$(ASCIIDOC_EXTRA) subdir=
>
> ### Cleaning rules
>
>
> ---
> base-commit: 29c73fc794c83505066ee6db893b2a83ac5fac63
> change-id: 20240523-make-tools-perf-install-71c3d1f11ffc
>
> Best regards,
> --
> Nicolas Schier
>
Ping. Are there complaints, or chances that someone picks this up?
Kind regards,
Nicolas
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] perf install: Don't propagate subdir to Documentation submake
2024-05-23 8:06 [PATCH] perf install: Don't propagate subdir to Documentation submake Nicolas Schier
2024-07-03 14:46 ` Nicolas Schier
@ 2024-07-03 15:54 ` Uwe Kleine-König
2024-07-04 20:00 ` Namhyung Kim
2 siblings, 0 replies; 4+ messages in thread
From: Uwe Kleine-König @ 2024-07-03 15:54 UTC (permalink / raw)
To: Nicolas Schier
Cc: Peter Zijlstra, Ingo Molnar, Arnaldo Carvalho de Melo,
Namhyung Kim, Mark Rutland, Alexander Shishkin, Jiri Olsa,
Ian Rogers, Adrian Hunter, linux-perf-users, linux-kernel
[-- Attachment #1: Type: text/plain, Size: 1380 bytes --]
Hello Nicolas,
On Thu, May 23, 2024 at 10:06:40AM +0200, Nicolas Schier wrote:
> Explicitly reset 'subdir' variable when descending to
> tools/perf/Documentation. Similar to commit f89fb55714b62 ("perf build:
> Don't propagate subdir to submakes for install_headers", 2023-01-02),
> calling the 'tools/perf_install' target via top-levels Makefile results
> in repeated subdir components when attempting to call the perf
> documentation installation rules:
>
> $ make tools/perf_install NO_LIBTRACEEVENT=1 JOBS=1
> [...]
> /bin/sh: 1: cd: can't cd to /data/linux/kbuild/tools/perf/tools/perf/
> ../../scripts/Makefile.include:17: *** output directory "/data/linux/kbuild/tools/perf/tools/perf/" does not exist. Stop.
> make[5]: *** [Makefile.perf:1096: try-install-man] Error 2
> make[4]: *** [Makefile.perf:264: sub-make] Error 2
> make[3]: *** [Makefile:113: install] Error 2
> make[2]: *** [Makefile:131: perf_install] Error 2
>
> Resetting 'subdir' fixes the call from top-level Makefile.
>
> Reported-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
> Signed-off-by: Nicolas Schier <n.schier@avm.de>
If it helps:
Tested-by: Uwe Kleine-König <u.kleine-koenig@baylibre.com>
Acked-by: Uwe Kleine-König <u.kleine-koenig@baylibre.com>
Did I already thank you? If not: Thanks a lot!
Best regards
Uwe
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] perf install: Don't propagate subdir to Documentation submake
2024-05-23 8:06 [PATCH] perf install: Don't propagate subdir to Documentation submake Nicolas Schier
2024-07-03 14:46 ` Nicolas Schier
2024-07-03 15:54 ` Uwe Kleine-König
@ 2024-07-04 20:00 ` Namhyung Kim
2 siblings, 0 replies; 4+ messages in thread
From: Namhyung Kim @ 2024-07-04 20:00 UTC (permalink / raw)
To: Peter Zijlstra, Ingo Molnar, Arnaldo Carvalho de Melo,
Mark Rutland, Alexander Shishkin, Jiri Olsa, Ian Rogers,
Adrian Hunter, Nicolas Schier
Cc: linux-perf-users, linux-kernel, Uwe Kleine-König
On Thu, 23 May 2024 10:06:40 +0200, Nicolas Schier wrote:
> Explicitly reset 'subdir' variable when descending to
> tools/perf/Documentation. Similar to commit f89fb55714b62 ("perf build:
> Don't propagate subdir to submakes for install_headers", 2023-01-02),
> calling the 'tools/perf_install' target via top-levels Makefile results
> in repeated subdir components when attempting to call the perf
> documentation installation rules:
>
> [...]
Applied to perf-tools-next, thanks!
Best regards,
Namhyung
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2024-07-04 20:00 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-05-23 8:06 [PATCH] perf install: Don't propagate subdir to Documentation submake Nicolas Schier
2024-07-03 14:46 ` Nicolas Schier
2024-07-03 15:54 ` Uwe Kleine-König
2024-07-04 20:00 ` Namhyung Kim
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).