mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
* [PATCH 1/1] perf: clear out make flags when calling kernel make kernelver
@ 2011-06-15 13:35 Andy Whitcroft
  2011-06-15 20:13 ` Michal Marek
  0 siblings, 1 reply; 2+ messages in thread
From: Andy Whitcroft @ 2011-06-15 13:35 UTC (permalink / raw)
  To: Linus Torvalds; +Cc: Michal Marek, linux-kernel, Andy Whitcroft

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 <apw@canonical.com>
---
 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


^ permalink raw reply	[flat|nested] 2+ messages in thread

* Re: [PATCH 1/1] perf: clear out make flags when calling kernel make kernelver
  2011-06-15 13:35 [PATCH 1/1] perf: clear out make flags when calling kernel make kernelver Andy Whitcroft
@ 2011-06-15 20:13 ` Michal Marek
  0 siblings, 0 replies; 2+ messages in thread
From: Michal Marek @ 2011-06-15 20:13 UTC (permalink / raw)
  To: Andy Whitcroft; +Cc: Linus Torvalds, linux-kernel

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 <apw@canonical.com>
> ---
>  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

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2011-06-15 20:13 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2011-06-15 13:35 [PATCH 1/1] perf: clear out make flags when calling kernel make kernelver Andy Whitcroft
2011-06-15 20:13 ` Michal Marek

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®