diff options
| author | Ingo Molnar <mingo@elte.hu> | 2011-06-13 19:48:31 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2011-06-13 19:48:31 +0200 |
| commit | 32f50d3f0ddc64e5a93197afdc9db0bdb989bad1 (patch) | |
| tree | d41ff22c5138741703983b380a2a58c4bc34f5bd /tools | |
| parent | abc4c44c373cc376865801b1c92f70816f8fd1ab (diff) | |
| parent | 3c25fa740e2084a3950f581378ec29a3c307ddfc (diff) | |
Merge branch 'linus' into auto-latest
Diffstat (limited to 'tools')
| -rwxr-xr-x | tools/perf/util/PERF-VERSION-GEN | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/tools/perf/util/PERF-VERSION-GEN b/tools/perf/util/PERF-VERSION-GEN index 26d4d3fd6deb..9c5fb4d93824 100755 --- a/tools/perf/util/PERF-VERSION-GEN +++ b/tools/perf/util/PERF-VERSION-GEN @@ -23,12 +23,7 @@ if test -d ../../.git -o -f ../../.git && then VN=$(echo "$VN" | sed -e 's/-/./g'); else - eval $(grep '^VERSION[[:space:]]*=' ../../Makefile|tr -d ' ') - eval $(grep '^PATCHLEVEL[[:space:]]*=' ../../Makefile|tr -d ' ') - eval $(grep '^SUBLEVEL[[:space:]]*=' ../../Makefile|tr -d ' ') - eval $(grep '^EXTRAVERSION[[:space:]]*=' ../../Makefile|tr -d ' ') - - VN="${VERSION}.${PATCHLEVEL}.${SUBLEVEL}${EXTRAVERSION}" + VN=$(make -sC ../.. kernelversion) fi VN=$(expr "$VN" : v*'\(.*\)') |