VPP-107 Fix for mistake that breaks pkg-rpm in 69/1369/2
authorEd Warnicke <eaw@cisco.com>
Thu, 2 Jun 2016 22:38:22 +0000 (17:38 -0500)
committerChris Luke <chris_luke@cable.comcast.com>
Fri, 3 Jun 2016 00:28:49 +0000 (00:28 +0000)
https://gerrit.fd.io/r/#/c/1338/

Change-Id: I8b7fffe24cbeb435b18faaada9ef1cea9fd93d39
Signed-off-by: Ed Warnicke <eaw@cisco.com>
build-root/scripts/version

index 8724ced..84ee5db 100755 (executable)
@@ -15,6 +15,7 @@ fi
 
 if [ "$1" = "rpm-release" ]; then
   [ -z "${ADD}" ] && echo release && exit
+  CMT=$(git describe --dirty --match 'v*'| cut -s -d- -f3,4 | sed 's/-/_/')
   echo ${ADD}${CMT:+~${CMT}}${BLD}
   exit
 fi