From a1b2f7793439b33f83aeb7ff8edf9931b5df645e Mon Sep 17 00:00:00 2001 From: Michal Marek Date: Mon, 30 May 2011 14:12:09 +0200 Subject: [PATCH] --- yaml --- r: 253360 b: refs/heads/master c: 5d61b9fd19d9f3cf653dbba615876e7792eea5ea h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/tools/perf/util/PERF-VERSION-GEN | 7 +------ 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index 05b8da111bd9..bb8f0f0eebe9 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: bfe5424a8b31624e7a476f959d552999f931e7c7 +refs/heads/master: 5d61b9fd19d9f3cf653dbba615876e7792eea5ea diff --git a/trunk/tools/perf/util/PERF-VERSION-GEN b/trunk/tools/perf/util/PERF-VERSION-GEN index 26d4d3fd6deb..9c5fb4d93824 100755 --- a/trunk/tools/perf/util/PERF-VERSION-GEN +++ b/trunk/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*'\(.*\)')