From: Jason Dillaman Date: Fri, 24 Feb 2017 18:13:52 +0000 (-0500) Subject: rtslib-fb: include rpm iteration based on git hash X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=d910094ade313b19a4483169f7902806035da9b4;p=ceph-build.git rtslib-fb: include rpm iteration based on git hash Signed-off-by: Jason Dillaman --- diff --git a/rtslib-fb/build/build_rpm b/rtslib-fb/build/build_rpm index 54b74a4a..966a499b 100644 --- a/rtslib-fb/build/build_rpm +++ b/rtslib-fb/build/build_rpm @@ -20,15 +20,14 @@ sudo gem install fpm # Get version RELEASE="$(lsb_release --short -r | cut -d '.' -f 1)" # system release VERSION="$(git describe --abbrev=0 --tags HEAD)" -REVISION="$(git rev-parse HEAD)" - +REVISION="$(git describe --tags HEAD | cut -d - -f 2- | sed 's/-/./')" ## Create the package # Make sure there are no other packages, first rm -f *.rpm # Create the package -fpm -s python -t rpm -n python-rtslib -v ${VERSION} -C ${DESTDIR} -d python-kmod -d python-six -d python2-pyudev setup.py +fpm -s python -t rpm -n python-rtslib -v ${VERSION} --iteration ${REVISION} -d python-kmod -d python-six -d python2-pyudev setup.py ## Upload the created RPMs to chacra