From: Dave Barach <dave@barachs.net>
Date: Mon, 25 Jan 2016 13:28:22 +0000 (-0500)
Subject: Fix rpm packaging bit-rot
X-Git-Tag: v16.06-rc1~390
X-Git-Url: https://gerrit.fd.io/r/gitweb?a=commitdiff_plain;h=0e5e3c3b62f2e4edbd9a8cdaccd5ad838545dd00;p=vpp.git

Fix rpm packaging bit-rot

Change-Id: Ia710b0773984891ee18c6c0558cc09b984043e38
Signed-off-by: Dave Barach <dave@barachs.net>
---

diff --git a/build-root/rpm/vpp.spec b/build-root/rpm/vpp.spec
index fbadf07c3ae..85b1286c76e 100644
--- a/build-root/rpm/vpp.spec
+++ b/build-root/rpm/vpp.spec
@@ -113,6 +113,7 @@ sysctl --system
 %{_unitdir}/vpp.service
 /usr/bin/vpp*
 /usr/bin/svm*
+/usr/bin/elftool
 %config /etc/sysctl.d/80-vpp.conf
 %config /etc/vpp/startup.conf
 
diff --git a/build-root/scripts/version b/build-root/scripts/version
index 9d236bc227a..bbafb9bbf8f 100755
--- a/build-root/scripts/version
+++ b/build-root/scripts/version
@@ -11,6 +11,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}
   exit
 fi