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

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

[Ben Hutchings]

[-- Attachment #1: Type: text/plain, Size: 804 bytes --]

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

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

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

[Tomas Glozar]

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

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

[John Kacur]

On Mon, 16 Sep 2024, Ben Hutchings wrote:

> 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
> 

Is Debian using out of tree builds Ben?
This is upstream already which is fine, but I remember Daniel telling me 
that he believed the distributions were no longer using out of tree builds
and he wanted to remove this capability in order to simplify the build 
system.

John Kacur

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

[Ben Hutchings]

[-- Attachment #1: Type: text/plain, Size: 1236 bytes --]

On Thu, 2024-10-10 at 13:39 -0400, John Kacur wrote:
> 
> On Mon, 16 Sep 2024, Ben Hutchings wrote:
> 
> > 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
> > 
> 
> Is Debian using out of tree builds Ben?
[...]

In the linux package specifically, yes, we try to do all builds out-of-
tree.

Ben.

-- 
Ben Hutchings - Debian developer, member of kernel, installer and LTS
teams

[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

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

[Steven Rostedt]

On Sun, 13 Oct 2024 22:34:49 +0200
Ben Hutchings <benh@debian.org> wrote:

> > Is Debian using out of tree builds Ben?  
> [...]
> 
> In the linux package specifically, yes, we try to do all builds out-of-
> tree.

Right. Out-of-tree builds is pretty much a must for anything in the Linux
kernel tree.

-- Steve