diff mbox series

tools/rtla: Fix installation from out-of-tree build

Message ID ZudubuoU_JHjPZ7w@decadent.org.uk (mailing list archive)
State New
Headers show
Series tools/rtla: Fix installation from out-of-tree build | expand

Commit Message

Ben Hutchings Sept. 15, 2024, 11:31 p.m. UTC 
rtla now supports out-of-tree builds, but installation fails as it
still tries to install the rtla binary from the source tree.  Use the
existing macro $(RTLA) to refer to the binary.

Fixes: 01474dc706ca ("tools/rtla: Use tools/build makefiles to build rtla")
Signed-off-by: Ben Hutchings <benh@debian.org>
---

Comments

Tomas Glozar Sept. 16, 2024, 11:35 a.m. UTC | #1 
po 16. 9. 2024 v 1:32 odesílatel Ben Hutchings <benh@debian.org> napsal:
>
> rtla now supports out-of-tree builds, but installation fails as it
> still tries to install the rtla binary from the source tree.  Use the
> existing macro $(RTLA) to refer to the binary.
>
> Fixes: 01474dc706ca ("tools/rtla: Use tools/build makefiles to build rtla")
> Signed-off-by: Ben Hutchings <benh@debian.org>
> ---
> --- a/tools/tracing/rtla/Makefile.rtla
> +++ b/tools/tracing/rtla/Makefile.rtla
> @@ -38,7 +38,7 @@ BINDIR                := /usr/bin
>  .PHONY: install
>  install: doc_install
>         @$(MKDIR) -p $(DESTDIR)$(BINDIR)
> -       $(call QUIET_INSTALL,rtla)$(INSTALL) rtla -m 755 $(DESTDIR)$(BINDIR)
> +       $(call QUIET_INSTALL,rtla)$(INSTALL) $(RTLA) -m 755 $(DESTDIR)$(BINDIR)
>         @$(STRIP) $(DESTDIR)$(BINDIR)/rtla
>         @test ! -f $(DESTDIR)$(BINDIR)/osnoise || $(RM) $(DESTDIR)$(BINDIR)/osnoise
>         @$(LN) rtla $(DESTDIR)$(BINDIR)/osnoise

Out-of-tree install is fixed for me when applied on latest upstream
top (e8fc317dfca9 "Merge tag 'vfs-6.12.procfs' of
git://git.kernel.org/pub/scm/linux/kernel/git/vfs/vfs").

Reviewed-by: Tomas Glozar <tglozar@redhat.com>
Tested-by: Tomas Glozar <tglozar@redhat.com>

Tomas
diff mbox series

Patch

--- a/tools/tracing/rtla/Makefile.rtla
+++ b/tools/tracing/rtla/Makefile.rtla
@@ -38,7 +38,7 @@  BINDIR		:= /usr/bin
 .PHONY: install
 install: doc_install
 	@$(MKDIR) -p $(DESTDIR)$(BINDIR)
-	$(call QUIET_INSTALL,rtla)$(INSTALL) rtla -m 755 $(DESTDIR)$(BINDIR)
+	$(call QUIET_INSTALL,rtla)$(INSTALL) $(RTLA) -m 755 $(DESTDIR)$(BINDIR)
 	@$(STRIP) $(DESTDIR)$(BINDIR)/rtla
 	@test ! -f $(DESTDIR)$(BINDIR)/osnoise || $(RM) $(DESTDIR)$(BINDIR)/osnoise
 	@$(LN) rtla $(DESTDIR)$(BINDIR)/osnoise