summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-06-09 16:27:42 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2011-06-09 16:27:42 -0700
commit6aecceccf5aa626b0af203e54ca62cbf308c53d8 (patch)
tree5d4889d531c1a92b38a36ea7a8d4f4e40252082d /tools
parentdfb863a714b81848504d3b73ca0ecae90b91cbc0 (diff)
parent5d61b9fd19d9f3cf653dbba615876e7792eea5ea (diff)
downloadlinux-6aecceccf5aa626b0af203e54ca62cbf308c53d8.tar.gz
linux-6aecceccf5aa626b0af203e54ca62cbf308c53d8.tar.bz2
linux-6aecceccf5aa626b0af203e54ca62cbf308c53d8.zip
Merge branch 'rc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6
* 'rc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6: perf: Use make kernelversion instead of parsing the Makefile kbuild: Hack for depmod not handling X.Y versions kbuild: Move depmod call to a separate script kbuild: Fix <linux/version.h> for empty SUBLEVEL or PATCHLEVEL kbuild: Fix KERNELVERSION for empty SUBLEVEL or PATCHLEVEL kbuild: silence Nothing to be done for 'all' message
Diffstat (limited to 'tools')
-rwxr-xr-xtools/perf/util/PERF-VERSION-GEN7
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*'\(.*\)')