From df739b210e3074d48adddf0d54b5b024cd7419dc Mon Sep 17 00:00:00 2001
From: Don Penney <don.penney@windriver.com>
Date: Thu, 17 Dec 2020 13:27:02 -0500
Subject: [PATCH] Add auto-version for remaining stx/ha packages

Update remaining StarlingX packages with hardcoded TIS_PATCH_VER to
use PKG_GITREVCOUNT where possible, with offsets as needed to ensure
the version is incremented above the hardcoded version.

Story: 2008455
Task: 41447
Signed-off-by: Don Penney <don.penney@windriver.com>
Change-Id: Idf5ef476192cdf4923d6c903f1a15e03cfe9d03f
---
 service-mgmt-api/centos/build_srpm.data       | 2 +-
 service-mgmt-client/centos/build_srpm.data    | 2 +-
 service-mgmt-tools/centos/build_srpm.data     | 2 +-
 service-mgmt/sm-common/centos/build_srpm.data | 2 +-
 service-mgmt/sm-db/centos/build_srpm.data     | 2 +-
 service-mgmt/sm/centos/build_srpm.data        | 2 +-
 stx-ocf-scripts/centos/build_srpm.data        | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/service-mgmt-api/centos/build_srpm.data b/service-mgmt-api/centos/build_srpm.data
index f0784868..f0cbfb5e 100644
--- a/service-mgmt-api/centos/build_srpm.data
+++ b/service-mgmt-api/centos/build_srpm.data
@@ -1,4 +1,4 @@
 SRC_DIR=sm-api
 TAR_NAME=sm-api
 VERSION=1.0
-TIS_PATCH_VER=4
+TIS_PATCH_VER=PKG_GITREVCOUNT
diff --git a/service-mgmt-client/centos/build_srpm.data b/service-mgmt-client/centos/build_srpm.data
index 2f139812..9da8740b 100644
--- a/service-mgmt-client/centos/build_srpm.data
+++ b/service-mgmt-client/centos/build_srpm.data
@@ -1,4 +1,4 @@
 SRC_DIR=sm-client
 TAR_NAME=sm-client
 VERSION=1.0
-TIS_PATCH_VER=2
+TIS_PATCH_VER=PKG_GITREVCOUNT
diff --git a/service-mgmt-tools/centos/build_srpm.data b/service-mgmt-tools/centos/build_srpm.data
index d37c1da9..dbc7cc1c 100644
--- a/service-mgmt-tools/centos/build_srpm.data
+++ b/service-mgmt-tools/centos/build_srpm.data
@@ -1,4 +1,4 @@
 SRC_DIR=sm-tools
 TAR_NAME=sm-tools
 VERSION=1.0
-TIS_PATCH_VER=2
+TIS_PATCH_VER=PKG_GITREVCOUNT
diff --git a/service-mgmt/sm-common/centos/build_srpm.data b/service-mgmt/sm-common/centos/build_srpm.data
index 6a178772..9697510f 100644
--- a/service-mgmt/sm-common/centos/build_srpm.data
+++ b/service-mgmt/sm-common/centos/build_srpm.data
@@ -1,2 +1,2 @@
 SRC_DIR=$PKG_BASE
-TIS_PATCH_VER=20
+TIS_PATCH_VER=PKG_GITREVCOUNT+15
diff --git a/service-mgmt/sm-db/centos/build_srpm.data b/service-mgmt/sm-db/centos/build_srpm.data
index 7b2efbf1..a7b54497 100644
--- a/service-mgmt/sm-db/centos/build_srpm.data
+++ b/service-mgmt/sm-db/centos/build_srpm.data
@@ -2,4 +2,4 @@ SRC_DIR=`pwd`
 COPY_LIST="$PKG_BASE/LICENSE"
 TAR_NAME=sm-db
 VERSION=1.0.0
-TIS_PATCH_VER=31
+TIS_PATCH_VER=PKG_GITREVCOUNT+19
diff --git a/service-mgmt/sm/centos/build_srpm.data b/service-mgmt/sm/centos/build_srpm.data
index 8430194b..4798ac52 100644
--- a/service-mgmt/sm/centos/build_srpm.data
+++ b/service-mgmt/sm/centos/build_srpm.data
@@ -2,4 +2,4 @@ SRC_DIR=$PKG_BASE
 COPY_LIST="$PKG_BASE/LICENSE"
 TAR_NAME=sm
 VERSION=1.0.0
-TIS_PATCH_VER=33
+TIS_PATCH_VER=PKG_GITREVCOUNT+24
diff --git a/stx-ocf-scripts/centos/build_srpm.data b/stx-ocf-scripts/centos/build_srpm.data
index 833e4170..1c7dfe75 100644
--- a/stx-ocf-scripts/centos/build_srpm.data
+++ b/stx-ocf-scripts/centos/build_srpm.data
@@ -1,2 +1,2 @@
 SRC_DIR="$PKG_BASE/src"
-TIS_PATCH_VER=3
+TIS_PATCH_VER=PKG_GITREVCOUNT