diff options
| author | Andy Whitcroft <apw@canonical.com> | 2011-06-15 09:35:00 -0400 |
|---|---|---|
| committer | Michal Marek <mmarek@suse.cz> | 2011-06-15 16:12:55 -0400 |
| commit | 37aa9a2eb4d9b1a4aec1fd18bb2bb6bca029de27 (patch) | |
| tree | 548a93ad0b76c121bf74471b67f638fda3bbc3c0 | |
| parent | 5d61b9fd19d9f3cf653dbba615876e7792eea5ea (diff) | |
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-x | 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 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 && | |||
| 23 | then | 23 | then |
| 24 | VN=$(echo "$VN" | sed -e 's/-/./g'); | 24 | VN=$(echo "$VN" | sed -e 's/-/./g'); |
| 25 | else | 25 | else |
| 26 | VN=$(make -sC ../.. kernelversion) | 26 | VN=$(MAKEFLAGS= make -sC ../.. kernelversion) |
| 27 | fi | 27 | fi |
| 28 | 28 | ||
| 29 | VN=$(expr "$VN" : v*'\(.*\)') | 29 | VN=$(expr "$VN" : v*'\(.*\)') |