From 467851e8d5128df6060399207843b78a9325c951 Mon Sep 17 00:00:00 2001
From: Don Penney <don.penney@windriver.com>
Date: Thu, 17 Dec 2020 13:20:49 -0500
Subject: [PATCH] Add auto-version for remaining stx/utilities 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.

Change-Id: Ia1ade77e12b948040f06806a5417d005488e3bb9
Story: 2008455
Task: 41460
Signed-off-by: Don Penney <don.penney@windriver.com>
---
 ceph/ceph-manager/centos/build_srpm.data                  | 2 +-
 ceph/python-cephclient/centos/build_srpm.data             | 2 +-
 security/stx-ssl/centos/build_srpm.data                   | 2 +-
 security/tpm2-openssl-engine/centos/build_srpm.data       | 2 +-
 tools/engtools/hostdata-collectors/centos/build_srpm.data | 2 +-
 utilities/logmgmt/centos/build_srpm.data                  | 2 +-
 utilities/namespace-utils/centos/build_srpm.data          | 2 +-
 utilities/nfscheck/centos/build_srpm.data                 | 2 +-
 utilities/pci-irq-affinity-agent/centos/build_srpm.data   | 2 +-
 utilities/update-motd/centos/build_srpm.data              | 2 +-
 utilities/worker-utils/centos/build_srpm.data             | 2 +-
 11 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/ceph/ceph-manager/centos/build_srpm.data b/ceph/ceph-manager/centos/build_srpm.data
index 0b361d63..3cec4f7b 100644
--- a/ceph/ceph-manager/centos/build_srpm.data
+++ b/ceph/ceph-manager/centos/build_srpm.data
@@ -1,3 +1,3 @@
 SRC_DIR="ceph-manager"
 COPY_LIST_TO_TAR="files scripts"
-TIS_PATCH_VER=6
+TIS_PATCH_VER=PKG_GITREVCOUNT
diff --git a/ceph/python-cephclient/centos/build_srpm.data b/ceph/python-cephclient/centos/build_srpm.data
index e6b7ea23..630e433f 100644
--- a/ceph/python-cephclient/centos/build_srpm.data
+++ b/ceph/python-cephclient/centos/build_srpm.data
@@ -1,2 +1,2 @@
 SRC_DIR="python-cephclient"
-TIS_PATCH_VER=0
+TIS_PATCH_VER=PKG_GITREVCOUNT
diff --git a/security/stx-ssl/centos/build_srpm.data b/security/stx-ssl/centos/build_srpm.data
index b2285b4c..2670bbbb 100644
--- a/security/stx-ssl/centos/build_srpm.data
+++ b/security/stx-ssl/centos/build_srpm.data
@@ -1,2 +1,2 @@
 COPY_LIST="$PKG_BASE/files/* $PKG_BASE/LICENSE $PKG_BASE/server-csr.conf"
-TIS_PATCH_VER=13
+TIS_PATCH_VER=PKG_GITREVCOUNT+8
diff --git a/security/tpm2-openssl-engine/centos/build_srpm.data b/security/tpm2-openssl-engine/centos/build_srpm.data
index 9c445bbb..a4570303 100644
--- a/security/tpm2-openssl-engine/centos/build_srpm.data
+++ b/security/tpm2-openssl-engine/centos/build_srpm.data
@@ -1,2 +1,2 @@
 SRC_DIR="tpm2-openssl-engine"
-TIS_PATCH_VER=2
+TIS_PATCH_VER=PKG_GITREVCOUNT
diff --git a/tools/engtools/hostdata-collectors/centos/build_srpm.data b/tools/engtools/hostdata-collectors/centos/build_srpm.data
index 5d6264ad..acb43cc3 100644
--- a/tools/engtools/hostdata-collectors/centos/build_srpm.data
+++ b/tools/engtools/hostdata-collectors/centos/build_srpm.data
@@ -1,2 +1,2 @@
 SRC_DIR="scripts"
-TIS_PATCH_VER=4
+TIS_PATCH_VER=PKG_GITREVCOUNT
diff --git a/utilities/logmgmt/centos/build_srpm.data b/utilities/logmgmt/centos/build_srpm.data
index 4502ccb0..95e5d39d 100644
--- a/utilities/logmgmt/centos/build_srpm.data
+++ b/utilities/logmgmt/centos/build_srpm.data
@@ -1,4 +1,4 @@
 SRC_DIR="logmgmt"
 COPY_LIST_TO_TAR="scripts"
 COPY_LIST="$SRC_DIR/LICENSE"
-TIS_PATCH_VER=5
+TIS_PATCH_VER=PKG_GITREVCOUNT
diff --git a/utilities/namespace-utils/centos/build_srpm.data b/utilities/namespace-utils/centos/build_srpm.data
index e981e8b5..33e5b344 100644
--- a/utilities/namespace-utils/centos/build_srpm.data
+++ b/utilities/namespace-utils/centos/build_srpm.data
@@ -1,2 +1,2 @@
 SRC_DIR="namespace-utils"
-TIS_PATCH_VER=0
+TIS_PATCH_VER=PKG_GITREVCOUNT
diff --git a/utilities/nfscheck/centos/build_srpm.data b/utilities/nfscheck/centos/build_srpm.data
index 4498c84d..acf66911 100644
--- a/utilities/nfscheck/centos/build_srpm.data
+++ b/utilities/nfscheck/centos/build_srpm.data
@@ -1,2 +1,2 @@
 COPY_LIST="LICENSE files/*"
-TIS_PATCH_VER=0
+TIS_PATCH_VER=PKG_GITREVCOUNT
diff --git a/utilities/pci-irq-affinity-agent/centos/build_srpm.data b/utilities/pci-irq-affinity-agent/centos/build_srpm.data
index 38fcf6e5..c9cdcb26 100644
--- a/utilities/pci-irq-affinity-agent/centos/build_srpm.data
+++ b/utilities/pci-irq-affinity-agent/centos/build_srpm.data
@@ -1,3 +1,3 @@
 SRC_DIR="pci_irq_affinity"
 COPY_LIST_TO_TAR="files/*"
-TIS_PATCH_VER=1
+TIS_PATCH_VER=PKG_GITREVCOUNT
diff --git a/utilities/update-motd/centos/build_srpm.data b/utilities/update-motd/centos/build_srpm.data
index 112ca54f..c3c7e237 100644
--- a/utilities/update-motd/centos/build_srpm.data
+++ b/utilities/update-motd/centos/build_srpm.data
@@ -1,2 +1,2 @@
 COPY_LIST="files/*"
-TIS_PATCH_VER=2
+TIS_PATCH_VER=PKG_GITREVCOUNT
diff --git a/utilities/worker-utils/centos/build_srpm.data b/utilities/worker-utils/centos/build_srpm.data
index 57088f9c..9d1b8eff 100644
--- a/utilities/worker-utils/centos/build_srpm.data
+++ b/utilities/worker-utils/centos/build_srpm.data
@@ -1,3 +1,3 @@
 SRC_DIR="worker-utils"
 COPY_LIST="$SRC_DIR/LICENSE"
-TIS_PATCH_VER=5
+TIS_PATCH_VER=PKG_GITREVCOUNT