1 files changed, 7 insertions, 11 deletions

diff --git a/tools/perf/util/PERF-VERSION-GEN b/tools/perf/util/PERF-VERSION-GEN
index 95264f304179..055fef34b6f6 100755
--- a/tools/perf/util/PERF-VERSION-GEN
+++ b/tools/perf/util/PERF-VERSION-GEN
@@ -9,18 +9,14 @@ GVF=${OUTPUT}PERF-VERSION-FILE
 LF='
 '
 
+#
 # First check if there is a .git to get the version from git describe
-# otherwise try to get the version from the kernel makefile
+# otherwise try to get the version from the kernel Makefile
+#
 if test -d ../../.git -o -f ../../.git &&
-        VN=$(git describe --match 'v[0-9].[0-9]*' --abbrev=4 HEAD 2>/dev/null) &&
-        case "$VN" in
-        *$LF*) (exit 1) ;;
-        v[0-9]*)
-                git update-index -q --refresh
-                test -z "$(git diff-index --name-only HEAD --)" ||
-                VN="$VN-dirty" ;;
-        esac
+        VN=$(git tag 2>/dev/null | tail -1 | grep -E "v[0-9].[0-9]*")
 then
+        VN=$(echo $VN"-g"$(git log -1 --abbrev=4 --pretty=format:"%h" HEAD))
         VN=$(echo "$VN" | sed -e 's/-/./g');
 else
         VN=$(MAKEFLAGS= make -sC ../.. kernelversion)
@@ -30,13 +26,13 @@ VN=$(expr "$VN" : v*'\(.*\)')
 
 if test -r $GVF
 then
-        VC=$(sed -e 's/^PERF_VERSION = //' <$GVF)
+        VC=$(sed -e 's/^#define PERF_VERSION "\(.*\)"/\1/' <$GVF)
 else
         VC=unset
 fi
 test "$VN" = "$VC" || {
         echo >&2 "PERF_VERSION = $VN"
-        echo "PERF_VERSION = $VN" >$GVF
+        echo "#define PERF_VERSION \"$VN\"" >$GVF
 }