diff options
| author |   Dave Barach <dave@barachs.net> | 2016-01-25 08:28:22 -0500 |
|---|---|---|
| committer | Dave Barach <dave@barachs.net> | 2016-01-25 08:28:40 -0500 |
| commit | 0e5e3c3b62f2e4edbd9a8cdaccd5ad838545dd00 (patch) | |
| tree | f5d5600bda552898e0616b7dcf27a4e0c23d455c | |
| parent | 309bef25f109ff9ef03e178ac6fe233f4d778d73 (diff) | |
Fix rpm packaging bit-rot
Change-Id: Ia710b0773984891ee18c6c0558cc09b984043e38
Signed-off-by: Dave Barach <dave@barachs.net>
| -rw-r--r-- | build-root/rpm/vpp.spec | 1 | ||||
| -rwxr-xr-x | build-root/scripts/version | 1 |
2 files changed, 2 insertions, 0 deletions
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 |