X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=build-root%2Fscripts%2Fversion;h=84ee5dbe4deb6d6c068aec5020d518373b45067c;hb=bd05e17d79156fb72cb12a0d4855bfeaf44bfa32;hp=9d236bc227a0fe161a530cbee7fbaaa4a649b14e;hpb=cb9cadad578297ffd78fa8a33670bdf1ab669e7e;p=vpp.git

diff --git a/build-root/scripts/version b/build-root/scripts/version
index 9d236bc227a..84ee5dbe4de 100755
--- a/build-root/scripts/version
+++ b/build-root/scripts/version
@@ -4,6 +4,10 @@ TAG=$(git describe | cut -d- -f1 | sed -e 's/^v//')
 ADD=$(git describe | cut -s -d- -f2)
 CMT=$(git describe --dirty --match 'v*'| cut -s -d- -f3,4)
 
+if [ -n "${BUILD_NUMBER}" ]; then
+       BLD="~b${BUILD_NUMBER}"
+fi
+
 if [ "$1" = "rpm-version" ]; then
   echo ${TAG}
   exit
@@ -11,12 +15,13 @@ fi
 
 if [ "$1" = "rpm-release" ]; then
   [ -z "${ADD}" ] && echo release && exit
-  echo ${ADD}~${CMT}
+  CMT=$(git describe --dirty --match 'v*'| cut -s -d- -f3,4 | sed 's/-/_/')
+  echo ${ADD}${CMT:+~${CMT}}${BLD}
   exit
 fi
 
 if [ -n "${ADD}" ]; then
-  echo ${TAG}-${ADD}~${CMT}
+  echo ${TAG}-${ADD}${CMT:+~${CMT}}${BLD}
 else
   echo ${TAG}
 fi