2021-07-06 19:01:28

by Justin Forbes

Subject: [PATCH] Fix the perf trace link location

The install perf_dlfilter.h patch included what seems to be
a typo in the Makefile.perf, which changed the location of the trace
link from '$(DESTDIR_SQ)$(bindir_SQ)/trace' to
'$(DESTDIR_SQ)$(dir_SQ)/trace' This reverts it back to the correct
location.

Fixes: 0beb218315e06 ("perf build: Install perf_dlfilter.h")
Signed-off-by: Justin M. Forbes <[email protected]>
---
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 c9e0de5b00c1..a1b9be78a1e0 100644
--- a/tools/perf/Makefile.perf
+++ b/tools/perf/Makefile.perf
@@ -923,7 +923,7 @@ install-tools: all install-gtk
$(call QUIET_INSTALL, binaries) \
$(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(bindir_SQ)'; \
$(INSTALL) $(OUTPUT)perf '$(DESTDIR_SQ)$(bindir_SQ)'; \
- $(LN) '$(DESTDIR_SQ)$(bindir_SQ)/perf' '$(DESTDIR_SQ)$(dir_SQ)/trace'; \
+ $(LN) '$(DESTDIR_SQ)$(bindir_SQ)/perf' '$(DESTDIR_SQ)$(bindir_SQ)/trace'; \
$(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(includedir_SQ)/perf'; \
$(INSTALL) util/perf_dlfilter.h -t '$(DESTDIR_SQ)$(includedir_SQ)/perf'
ifndef NO_PERF_READ_VDSO32
--
2.31.1

2021-07-06 19:09:44

by Arnaldo Carvalho de Melo

Subject: Re: [PATCH] Fix the perf trace link location

Em Tue, Jul 06, 2021 at 01:59:51PM -0500, Justin M. Forbes escreveu:
> The install perf_dlfilter.h patch included what seems to be
> a typo in the Makefile.perf, which changed the location of the trace
> link from '$(DESTDIR_SQ)$(bindir_SQ)/trace' to
> '$(DESTDIR_SQ)$(dir_SQ)/trace' This reverts it back to the correct
> location.

Thanks, applied!

- Arnaldo

> Fixes: 0beb218315e06 ("perf build: Install perf_dlfilter.h")
> Signed-off-by: Justin M. Forbes <[email protected]>
> ---
> 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 c9e0de5b00c1..a1b9be78a1e0 100644
> --- a/tools/perf/Makefile.perf
> +++ b/tools/perf/Makefile.perf
> @@ -923,7 +923,7 @@ install-tools: all install-gtk
> $(call QUIET_INSTALL, binaries) \
> $(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(bindir_SQ)'; \
> $(INSTALL) $(OUTPUT)perf '$(DESTDIR_SQ)$(bindir_SQ)'; \
> - $(LN) '$(DESTDIR_SQ)$(bindir_SQ)/perf' '$(DESTDIR_SQ)$(dir_SQ)/trace'; \
> + $(LN) '$(DESTDIR_SQ)$(bindir_SQ)/perf' '$(DESTDIR_SQ)$(bindir_SQ)/trace'; \
> $(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(includedir_SQ)/perf'; \
> $(INSTALL) util/perf_dlfilter.h -t '$(DESTDIR_SQ)$(includedir_SQ)/perf'
> ifndef NO_PERF_READ_VDSO32
> --
> 2.31.1
>

--

- Arnaldo