iscsi: ensure initial stable release receives proper RPM revision

Signed-off-by: Jason Dillaman <dillaman@redhat.com>

diff --git a/ceph-iscsi-cli/build/build_rpm b/ceph-iscsi-cli/build/build_rpm
index 9a0487207df2f12b6dcbf8ca0b06ec9d6a5b69e3..d4ebaff228ad916146fd2a8fef7d840447d5df2e 100644 (file)
--- a/ceph-iscsi-cli/build/build_rpm
+++ b/ceph-iscsi-cli/build/build_rpm
@@ -17,6 +17,9 @@ sudo yum install -y mock
 RELEASE="$(lsb_release --short -r | cut -d '.' -f 1)" # system release
 VERSION="$(git describe --abbrev=0 --tags HEAD)"
 REVISION="$(git describe --tags HEAD | cut -d - -f 2- | sed 's/-/./')"
+if [ "$VERSION" = "$REVISION" ]; then
+  REVISION="1"
+fi
 
 # Create dummy dist tar
 tar cf dist/${PROJECT}-${VERSION}.tar.gz \

diff --git a/ceph-iscsi-config/build/build_rpm b/ceph-iscsi-config/build/build_rpm
index 6c2abbef363a60ab25411acd4d5397a1d1b94e81..30f91a882a5d04e678c9f4e8aef674b11f9d392c 100644 (file)
--- a/ceph-iscsi-config/build/build_rpm
+++ b/ceph-iscsi-config/build/build_rpm
@@ -17,6 +17,9 @@ sudo yum install -y mock
 RELEASE="$(lsb_release --short -r | cut -d '.' -f 1)" # system release
 VERSION="$(git describe --abbrev=0 --tags HEAD)"
 REVISION="$(git describe --tags HEAD | cut -d - -f 2- | sed 's/-/./')"
+if [ "$VERSION" = "$REVISION" ]; then
+  REVISION="1"
+fi
 
 # Create dummy dist tar
 tar cf dist/${PROJECT}-${VERSION}.tar.gz \

diff --git a/ceph-iscsi-tools/build/build_rpm b/ceph-iscsi-tools/build/build_rpm
index eb61e9273e74662ff93172b4d6bb8622e5926e9d..7a9d503f6c910e8a4bb710162afaab2c026e3904 100644 (file)
--- a/ceph-iscsi-tools/build/build_rpm
+++ b/ceph-iscsi-tools/build/build_rpm
@@ -17,6 +17,9 @@ sudo yum install -y mock
 RELEASE="$(lsb_release --short -r | cut -d '.' -f 1)" # system release
 VERSION="$(git describe --abbrev=0 --tags HEAD)"
 REVISION="$(git describe --tags HEAD | cut -d - -f 2- | sed 's/-/./')"
+if [ "$VERSION" = "$REVISION" ]; then
+  REVISION="1"
+fi
 
 # Create dummy dist tar
 tar cf dist/${PROJECT}-${VERSION}.tar.gz \

diff --git a/rtslib-fb/build/build_rpm b/rtslib-fb/build/build_rpm
index ff993b1af9a11e5c106d4feb8db5fe6c2aea34f7..fd67a016916c3c159fb1cc7d364d6ac3e0edb323 100644 (file)
--- a/rtslib-fb/build/build_rpm
+++ b/rtslib-fb/build/build_rpm
@@ -22,6 +22,9 @@ sudo gem install fpm
 RELEASE="$(lsb_release --short -r | cut -d '.' -f 1)" # system release
 VERSION="$(git describe --abbrev=0 --tags HEAD)"
 REVISION="$(git describe --tags HEAD | cut -d - -f 2- | sed 's/-/./')"
+if [ "$VERSION" = "$REVISION" ]; then
+  REVISION="1"
+fi
 
 ## Create the package
 # Make sure there are no other packages, first

diff --git a/tcmu-runner/build/build_rpm b/tcmu-runner/build/build_rpm
index b3b9def51bdd2f5233c7e961ad3a553c9c125a05..a88fb19666702641651382600abf69e99a30084c 100644 (file)
--- a/tcmu-runner/build/build_rpm
+++ b/tcmu-runner/build/build_rpm
@@ -81,6 +81,9 @@ gzip ${DESTDIR}/usr/share/man/man8/tcmu-runner.8
 RELEASE="$(lsb_release --short -r | cut -d '.' -f 1)" # system release
 VERSION="$(git describe --abbrev=0 --tags HEAD | cut -d - -f 1)"
 REVISION="$(git describe --tags HEAD | cut -d - -f 2- | sed 's/-/./g' | sed 's/^rc/0./')"
+if [ "$VERSION" = "$REVISION" ]; then
+  REVISION="1"
+fi
 
 ## Create the package
 # Make sure there are no other packages, first