Subject: [PATCH V2] rtla: Fix Makefile when called from -C tools/

Sedat Dilek reported an error on rtla Makefile when running:

$ make -C tools/ clean
[...]
make[2]: Entering directory
'/home/dileks/src/linux-kernel/git/tools/tracing/rtla'
[...]
'/home/dileks/src/linux-kernel/git/Documentation/tools/rtla'
/bin/sh: 1: test: rtla-make[2]:: unexpected operator <------ The problem
rm: cannot remove '/home/dileks/src/linux-kernel/git': Is a directory
make[2]: *** [Makefile:120: clean] Error 1
make[2]: Leaving directory

This occurred because the rtla calls kernel's Makefile to get the
version in silence mode, e.g.,

$ make -sC ../../.. kernelversion
5.19.0-rc4

But the -s is being ignored when rtla's makefile is called indirectly,
so the output looks like this:

$ make -C ../../.. kernelversion
make: Entering directory '/root/linux'
5.19.0-rc4
make: Leaving directory '/root/linux'

Using 'grep -v make' avoids this problem, e.g.,

$ make -C ../../.. kernelversion | grep -v make
5.19.0-rc4

Thus, add | grep -v make.

Cc: Steven Rostedt <[email protected]>
Fixes: 8619e32825fd ("rtla: Follow kernel version")
Reported-by: Sedat Dilek <[email protected]>
Tested-by: Sedat Dilek <[email protected]>
Signed-off-by: Daniel Bristot de Oliveira <[email protected]>
---
tools/tracing/rtla/Makefile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/tracing/rtla/Makefile b/tools/tracing/rtla/Makefile
index 3822f4ea5f49..1bea2d16d4c1 100644
--- a/tools/tracing/rtla/Makefile
+++ b/tools/tracing/rtla/Makefile
@@ -1,6 +1,6 @@
NAME := rtla
# Follow the kernel version
-VERSION := $(shell cat VERSION 2> /dev/null || make -sC ../../.. kernelversion)
+VERSION := $(shell cat VERSION 2> /dev/null || make -sC ../../.. kernelversion | grep -v make)

# From libtracefs:
# Makefiles suck: This macro sets a default value of $(2) for the
--
2.32.0


2022-07-14 09:12:29

by Sedat Dilek

[permalink] [raw]
Subject: Re: [PATCH V2] rtla: Fix Makefile when called from -C tools/

On Wed, Jul 13, 2022 at 11:32 PM Daniel Bristot de Oliveira
<[email protected]> wrote:
>
> Sedat Dilek reported an error on rtla Makefile when running:
>
> $ make -C tools/ clean
> [...]
> make[2]: Entering directory
> '/home/dileks/src/linux-kernel/git/tools/tracing/rtla'
> [...]
> '/home/dileks/src/linux-kernel/git/Documentation/tools/rtla'
> /bin/sh: 1: test: rtla-make[2]:: unexpected operator <------ The problem
> rm: cannot remove '/home/dileks/src/linux-kernel/git': Is a directory
> make[2]: *** [Makefile:120: clean] Error 1
> make[2]: Leaving directory
>
> This occurred because the rtla calls kernel's Makefile to get the
> version in silence mode, e.g.,
>
> $ make -sC ../../.. kernelversion
> 5.19.0-rc4
>
> But the -s is being ignored when rtla's makefile is called indirectly,
> so the output looks like this:
>
> $ make -C ../../.. kernelversion
> make: Entering directory '/root/linux'
> 5.19.0-rc4
> make: Leaving directory '/root/linux'
>
> Using 'grep -v make' avoids this problem, e.g.,
>
> $ make -C ../../.. kernelversion | grep -v make
> 5.19.0-rc4
>
> Thus, add | grep -v make.
>
> Cc: Steven Rostedt <[email protected]>
> Fixes: 8619e32825fd ("rtla: Follow kernel version")
> Reported-by: Sedat Dilek <[email protected]>
> Tested-by: Sedat Dilek <[email protected]>
> Signed-off-by: Daniel Bristot de Oliveira <[email protected]>
> ---

Thanks for v2.
That looks good to me.

Daniel, you are right that not passing -s to make-line will not show
the grep output.

Formally and again my...

Reported-by: Sedat Dilek <[email protected]>
Tested-by: Sedat Dilek <[email protected]>

-Sedat-

> tools/tracing/rtla/Makefile | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/tools/tracing/rtla/Makefile b/tools/tracing/rtla/Makefile
> index 3822f4ea5f49..1bea2d16d4c1 100644
> --- a/tools/tracing/rtla/Makefile
> +++ b/tools/tracing/rtla/Makefile
> @@ -1,6 +1,6 @@
> NAME := rtla
> # Follow the kernel version
> -VERSION := $(shell cat VERSION 2> /dev/null || make -sC ../../.. kernelversion)
> +VERSION := $(shell cat VERSION 2> /dev/null || make -sC ../../.. kernelversion | grep -v make)
>
> # From libtracefs:
> # Makefiles suck: This macro sets a default value of $(2) for the
> --
> 2.32.0
>

2022-07-14 09:58:54

by Sedat Dilek

[permalink] [raw]
Subject: Re: [PATCH V2] rtla: Fix Makefile when called from -C tools/

On Thu, Jul 14, 2022 at 11:07 AM Sedat Dilek <[email protected]> wrote:
>
> On Wed, Jul 13, 2022 at 11:32 PM Daniel Bristot de Oliveira
> <[email protected]> wrote:
> >
> > Sedat Dilek reported an error on rtla Makefile when running:
> >
> > $ make -C tools/ clean
> > [...]
> > make[2]: Entering directory
> > '/home/dileks/src/linux-kernel/git/tools/tracing/rtla'
> > [...]
> > '/home/dileks/src/linux-kernel/git/Documentation/tools/rtla'
> > /bin/sh: 1: test: rtla-make[2]:: unexpected operator <------ The problem
> > rm: cannot remove '/home/dileks/src/linux-kernel/git': Is a directory
> > make[2]: *** [Makefile:120: clean] Error 1
> > make[2]: Leaving directory
> >
> > This occurred because the rtla calls kernel's Makefile to get the
> > version in silence mode, e.g.,
> >
> > $ make -sC ../../.. kernelversion
> > 5.19.0-rc4
> >
> > But the -s is being ignored when rtla's makefile is called indirectly,
> > so the output looks like this:
> >
> > $ make -C ../../.. kernelversion
> > make: Entering directory '/root/linux'
> > 5.19.0-rc4
> > make: Leaving directory '/root/linux'
> >
> > Using 'grep -v make' avoids this problem, e.g.,
> >
> > $ make -C ../../.. kernelversion | grep -v make
> > 5.19.0-rc4
> >
> > Thus, add | grep -v make.
> >
> > Cc: Steven Rostedt <[email protected]>
> > Fixes: 8619e32825fd ("rtla: Follow kernel version")
> > Reported-by: Sedat Dilek <[email protected]>
> > Tested-by: Sedat Dilek <[email protected]>
> > Signed-off-by: Daniel Bristot de Oliveira <[email protected]>
> > ---
>
> Thanks for v2.
> That looks good to me.
>
> Daniel, you are right that not passing -s to make-line will not show
> the grep output.
>
> Formally and again my...
>
> Reported-by: Sedat Dilek <[email protected]>
> Tested-by: Sedat Dilek <[email protected]>
>

Addendum:

Subject?

[PATCH V2] rtla: Fix Makefile when called from -C tools/

...called from -C tools/ clean?

-Sedat-

>
> > tools/tracing/rtla/Makefile | 2 +-
> > 1 file changed, 1 insertion(+), 1 deletion(-)
> >
> > diff --git a/tools/tracing/rtla/Makefile b/tools/tracing/rtla/Makefile
> > index 3822f4ea5f49..1bea2d16d4c1 100644
> > --- a/tools/tracing/rtla/Makefile
> > +++ b/tools/tracing/rtla/Makefile
> > @@ -1,6 +1,6 @@
> > NAME := rtla
> > # Follow the kernel version
> > -VERSION := $(shell cat VERSION 2> /dev/null || make -sC ../../.. kernelversion)
> > +VERSION := $(shell cat VERSION 2> /dev/null || make -sC ../../.. kernelversion | grep -v make)
> >
> > # From libtracefs:
> > # Makefiles suck: This macro sets a default value of $(2) for the
> > --
> > 2.32.0
> >

Subject: Re: [PATCH V2] rtla: Fix Makefile when called from -C tools/

On 7/14/22 11:53, Sedat Dilek wrote:
>>
> Addendum:
>
> Subject?
>
> [PATCH V2] rtla: Fix Makefile when called from -C tools/
>
> ...called from -C tools/ clean?
>
it is not needed.

-- Daniel

2022-07-28 08:25:44

by Sedat Dilek

[permalink] [raw]
Subject: Re: [PATCH V2] rtla: Fix Makefile when called from -C tools/

On Wed, Jul 13, 2022 at 11:32 PM Daniel Bristot de Oliveira
<[email protected]> wrote:
>
> Sedat Dilek reported an error on rtla Makefile when running:
>
> $ make -C tools/ clean
> [...]
> make[2]: Entering directory
> '/home/dileks/src/linux-kernel/git/tools/tracing/rtla'
> [...]
> '/home/dileks/src/linux-kernel/git/Documentation/tools/rtla'
> /bin/sh: 1: test: rtla-make[2]:: unexpected operator <------ The problem
> rm: cannot remove '/home/dileks/src/linux-kernel/git': Is a directory
> make[2]: *** [Makefile:120: clean] Error 1
> make[2]: Leaving directory
>
> This occurred because the rtla calls kernel's Makefile to get the
> version in silence mode, e.g.,
>
> $ make -sC ../../.. kernelversion
> 5.19.0-rc4
>
> But the -s is being ignored when rtla's makefile is called indirectly,
> so the output looks like this:
>
> $ make -C ../../.. kernelversion
> make: Entering directory '/root/linux'
> 5.19.0-rc4
> make: Leaving directory '/root/linux'
>
> Using 'grep -v make' avoids this problem, e.g.,
>
> $ make -C ../../.. kernelversion | grep -v make
> 5.19.0-rc4
>
> Thus, add | grep -v make.
>
> Cc: Steven Rostedt <[email protected]>
> Fixes: 8619e32825fd ("rtla: Follow kernel version")
> Reported-by: Sedat Dilek <[email protected]>
> Tested-by: Sedat Dilek <[email protected]>
> Signed-off-by: Daniel Bristot de Oliveira <[email protected]>

Hi,

what is the status of this patch?

Is it missing some ACKs e.g. from Steven?

Can this go directly to Linus tree as I wanted to see it in Linux v5.19 FINAL?

Thanks.

Regards,
-Sedat-

> ---
> tools/tracing/rtla/Makefile | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/tools/tracing/rtla/Makefile b/tools/tracing/rtla/Makefile
> index 3822f4ea5f49..1bea2d16d4c1 100644
> --- a/tools/tracing/rtla/Makefile
> +++ b/tools/tracing/rtla/Makefile
> @@ -1,6 +1,6 @@
> NAME := rtla
> # Follow the kernel version
> -VERSION := $(shell cat VERSION 2> /dev/null || make -sC ../../.. kernelversion)
> +VERSION := $(shell cat VERSION 2> /dev/null || make -sC ../../.. kernelversion | grep -v make)
>
> # From libtracefs:
> # Makefiles suck: This macro sets a default value of $(2) for the
> --
> 2.32.0
>

2022-07-28 08:31:05

by Sedat Dilek

[permalink] [raw]
Subject: Re: [PATCH V2] rtla: Fix Makefile when called from -C tools/

On Thu, Jul 28, 2022 at 10:01 AM Sedat Dilek <[email protected]> wrote:
>
> On Wed, Jul 13, 2022 at 11:32 PM Daniel Bristot de Oliveira
> <[email protected]> wrote:
> >
> > Sedat Dilek reported an error on rtla Makefile when running:
> >
> > $ make -C tools/ clean
> > [...]
> > make[2]: Entering directory
> > '/home/dileks/src/linux-kernel/git/tools/tracing/rtla'
> > [...]
> > '/home/dileks/src/linux-kernel/git/Documentation/tools/rtla'
> > /bin/sh: 1: test: rtla-make[2]:: unexpected operator <------ The problem
> > rm: cannot remove '/home/dileks/src/linux-kernel/git': Is a directory
> > make[2]: *** [Makefile:120: clean] Error 1
> > make[2]: Leaving directory
> >
> > This occurred because the rtla calls kernel's Makefile to get the
> > version in silence mode, e.g.,
> >
> > $ make -sC ../../.. kernelversion
> > 5.19.0-rc4
> >
> > But the -s is being ignored when rtla's makefile is called indirectly,
> > so the output looks like this:
> >
> > $ make -C ../../.. kernelversion
> > make: Entering directory '/root/linux'
> > 5.19.0-rc4
> > make: Leaving directory '/root/linux'
> >
> > Using 'grep -v make' avoids this problem, e.g.,
> >
> > $ make -C ../../.. kernelversion | grep -v make
> > 5.19.0-rc4
> >
> > Thus, add | grep -v make.
> >
> > Cc: Steven Rostedt <[email protected]>
> > Fixes: 8619e32825fd ("rtla: Follow kernel version")
> > Reported-by: Sedat Dilek <[email protected]>
> > Tested-by: Sedat Dilek <[email protected]>
> > Signed-off-by: Daniel Bristot de Oliveira <[email protected]>
>
> Hi,
>
> what is the status of this patch?
>
> Is it missing some ACKs e.g. from Steven?
>
> Can this go directly to Linus tree as I wanted to see it in Linux v5.19 FINAL?
>
> Thanks.
>

INFO:

Steven's autoresponder says:

I'm currently traveling and may be slow to respond (and may not at all).
I'll be back at my normal hours on Tuesday, Aug 2nd.

Here the lore-link to v2:

[1] https://lore.kernel.org/all/870c02d4d97a921f02a31fa3b229fc549af61a20.1657747763.git.bristot@kernel.org/

-Sedat-

>
> > ---
> > tools/tracing/rtla/Makefile | 2 +-
> > 1 file changed, 1 insertion(+), 1 deletion(-)
> >
> > diff --git a/tools/tracing/rtla/Makefile b/tools/tracing/rtla/Makefile
> > index 3822f4ea5f49..1bea2d16d4c1 100644
> > --- a/tools/tracing/rtla/Makefile
> > +++ b/tools/tracing/rtla/Makefile
> > @@ -1,6 +1,6 @@
> > NAME := rtla
> > # Follow the kernel version
> > -VERSION := $(shell cat VERSION 2> /dev/null || make -sC ../../.. kernelversion)
> > +VERSION := $(shell cat VERSION 2> /dev/null || make -sC ../../.. kernelversion | grep -v make)
> >
> > # From libtracefs:
> > # Makefiles suck: This macro sets a default value of $(2) for the
> > --
> > 2.32.0
> >

2022-07-28 16:52:05

by Steven Rostedt

[permalink] [raw]
Subject: Re: [PATCH V2] rtla: Fix Makefile when called from -C tools/



On July 28, 2022 1:15:34 AM PDT, Sedat Dilek <[email protected]> wrote:
>On Thu, Jul 28, 2022 at 10:01 AM Sedat Dilek <[email protected]> wrote:
>>
>> Hi,
>>
>> what is the status of this patch?
>>
>> Is it missing some ACKs e.g. from Steven?
>>
>> Can this go directly to Linus tree as I wanted to see it in Linux v5.19 FINAL?
>>
>> Thanks.
>>
>
>INFO:
>
>Steven's autoresponder says:
>
>I'm currently traveling and may be slow to respond (and may not at all).
>I'll be back at my normal hours on Tuesday, Aug 2nd.


Yes, I'm currently at the SCaLE 19x conference, but I plan on pulling in rtla and rv work while I'm here.

-- Steve

>
>Here the lore-link to v2:
>
>[1] https://lore.kernel.org/all/870c02d4d97a921f02a31fa3b229fc549af61a20.1657747763.git.bristot@kernel.org/
>
>-Sedat-
>
>>
>> > ---
>> > tools/tracing/rtla/Makefile | 2 +-
>> > 1 file changed, 1 insertion(+), 1 deletion(-)
>> >
>> > diff --git a/tools/tracing/rtla/Makefile b/tools/tracing/rtla/Makefile
>> > index 3822f4ea5f49..1bea2d16d4c1 100644
>> > --- a/tools/tracing/rtla/Makefile
>> > +++ b/tools/tracing/rtla/Makefile
>> > @@ -1,6 +1,6 @@
>> > NAME := rtla
>> > # Follow the kernel version
>> > -VERSION := $(shell cat VERSION 2> /dev/null || make -sC ../../.. kernelversion)
>> > +VERSION := $(shell cat VERSION 2> /dev/null || make -sC ../../.. kernelversion | grep -v make)
>> >
>> > # From libtracefs:
>> > # Makefiles suck: This macro sets a default value of $(2) for the
>> > --
>> > 2.32.0
>> >

--
Sent from my Android device with K-9 Mail. Please excuse my brevity and top posting.