2011-06-15 13:35:31

by Andy Whitcroft

Subject: [PATCH 1/1] perf: clear out make flags when calling kernel make kernelver

When generating the perf version from the kernel version using 'make
kernelver' it is necessary to clear out any MAKEFLAGS otherwise they may
trigger additional output which pollute the contents.

Signed-off-by: Andy Whitcroft <[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.4.1

2011-06-15 20:13:56

by Michal Marek

Subject: Re: [PATCH 1/1] perf: clear out make flags when calling kernel make kernelver

On Wed, Jun 15, 2011 at 02:35:00PM +0100, Andy Whitcroft wrote:
> When generating the perf version from the kernel version using 'make
> kernelver' it is necessary to clear out any MAKEFLAGS otherwise they may
> trigger additional output which pollute the contents.
>
> Signed-off-by: Andy Whitcroft <[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

Thanks, applied to kbuild-2.6.git#rc-fixes.

Michal