summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndy Whitcroft <apw@canonical.com>2011-06-15 14:35:00 +0100
committerMichal Marek <mmarek@suse.cz>2011-06-15 22:12:55 +0200
commit37aa9a2eb4d9b1a4aec1fd18bb2bb6bca029de27 (patch)
tree548a93ad0b76c121bf74471b67f638fda3bbc3c0
parent5d61b9fd19d9f3cf653dbba615876e7792eea5ea (diff)
downloadlinux-37aa9a2eb4d9b1a4aec1fd18bb2bb6bca029de27.tar.gz
linux-37aa9a2eb4d9b1a4aec1fd18bb2bb6bca029de27.tar.bz2
linux-37aa9a2eb4d9b1a4aec1fd18bb2bb6bca029de27.zip
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 <apw@canonical.com> Signed-off-by: Michal Marek <mmarek@suse.cz>
-rwxr-xr-xtools/perf/util/PERF-VERSION-GEN2
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/perf/util/PERF-VERSION-GEN b/tools/perf/util/PERF-VERSION-GEN
index 9c5fb4d93824..ad73300f7bac 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*'\(.*\)')