From: Jason Dillaman <dillaman@redhat.com>
Date: Tue, 23 Jan 2018 13:51:46 +0000 (-0500)
Subject: iscsi: ensure initial stable release receives proper RPM revision
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F948%2Fhead;p=ceph-build.git

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 9a0487207..d4ebaff22 100644
--- 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 6c2abbef3..30f91a882 100644
--- 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 eb61e9273..7a9d503f6 100644
--- 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 ff993b1af..fd67a0169 100644
--- 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 b3b9def51..a88fb1966 100644
--- 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