Synchronise with 4.8

[kconfig-frontends] / scripts / version.sh

diff --git a/scripts/version.sh b/scripts/version.sh
index b3d0c6ebeab3daccc4d3233a721993732cb167be..fbeb7df1f632b9089002784e5456e31385240101 100755 (executable)
--- a/scripts/version.sh
+++ b/scripts/version.sh
@@ -26,13 +26,13 @@ if [ ${internal} -ne 0 ]; then
 fi
 
 k_ver_plain="$( printf "%s" "${k_ver}"  \
-                |sed -r -e 's/-rc.*//;' )"
+                |sed -e 's/-rc.*//;' )"
 
 case "${kf_ver}" in
-    hg) kf_ver="hg_$( hg id -i -r . )"
-        k_ver_extra="$( printf "_%-7.7s" "${k_cset}" )"
-        ;;
-    *)  k_ver_extra="";;
+    git) kf_ver="-$( git rev-parse --short HEAD )"
+         k_ver_extra="$( printf "_%-7.7s" "${k_cset}" )"
+         ;;
+    *)   k_ver_extra="";;
 esac
 
 if [ "${plain}" -eq 1 ]; then