Subject: [PATCH] perf tools: Don't corrupt PERF-VERSION-FILE with make debug

When running make with debug option -d the PERF-VERSION-FILE gets
corrupted because make is noisy:

PERF-VERSION-FILE:2: *** missing separator. Stop.

Fixing this by not passing the make flags in the MAKEFLAGS environment
variable to the sub-make that generates the version string.

Signed-off-by: Robert Richter <[email protected]>
---
tools/perf/util/PERF-VERSION-GEN | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/tools/perf/util/PERF-VERSION-GEN b/tools/perf/util/PERF-VERSION-GEN
index 9c5fb4d..ad73300 100755
--- a/tools/perf/util/PERF-VERSION-GEN
+++ b/tools/perf/util/PERF-VERSION-GEN
@@ -23,7 +23,7 @@ if test -d ../../.git -o -f ../../.git &&
then
VN=$(echo "$VN" | sed -e 's/-/./g');
else
- VN=$(make -sC ../.. kernelversion)
+ VN=$(MAKEFLAGS= make -sC ../.. kernelversion)
fi

VN=$(expr "$VN" : v*'\(.*\)')
--
1.7.5.3


2011-06-22 09:50:33

by Ingo Molnar

[permalink] [raw]
Subject: Re: [PATCH] perf tools: Don't corrupt PERF-VERSION-FILE with make debug


* Robert Richter <[email protected]> wrote:

> When running make with debug option -d the PERF-VERSION-FILE gets
> corrupted because make is noisy:
>
> PERF-VERSION-FILE:2: *** missing separator. Stop.
>
> Fixing this by not passing the make flags in the MAKEFLAGS environment
> variable to the sub-make that generates the version string.
>
> Signed-off-by: Robert Richter <[email protected]>
> ---
> tools/perf/util/PERF-VERSION-GEN | 2 +-
> 1 files changed, 1 insertions(+), 1 deletions(-)
>
> diff --git a/tools/perf/util/PERF-VERSION-GEN b/tools/perf/util/PERF-VERSION-GEN
> index 9c5fb4d..ad73300 100755
> --- a/tools/perf/util/PERF-VERSION-GEN
> +++ b/tools/perf/util/PERF-VERSION-GEN
> @@ -23,7 +23,7 @@ if test -d ../../.git -o -f ../../.git &&
> then
> VN=$(echo "$VN" | sed -e 's/-/./g');
> else
> - VN=$(make -sC ../.. kernelversion)
> + VN=$(MAKEFLAGS= make -sC ../.. kernelversion)

Yeah, and this has been fixed recently, via:

37aa9a2eb4d9: perf: clear out make flags when calling kernel make kernelver

Thanks,

Ingo