diff options
| author |   Paul Mundt <lethal@linux-sh.org> | 2011-06-15 15:48:40 +0900 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2011-06-15 15:48:40 +0900 |
| commit | fc90ec86294202b306b7b124f2f6d5035c94fa13 (patch) | |
| tree | da3da512c8082f2864c95de9684a0a75ac997dad /tools | |
| parent | fbdev: sh_mobile_hdmi: fix regression: statically enable RTPM (diff) | |
| parent | fbdev: da8xx: use display information in info not in var for panning (diff) | |
Merge branch 'fbdev/panning-fixes'
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*'\(.*\)') |