From adaaba0c21e78a2a24c459e34ea7c9963024e3f6 Mon Sep 17 00:00:00 2001
From: Don Penney <don.penney@windriver.com>
Date: Thu, 17 Dec 2020 13:17:58 -0500
Subject: [PATCH] Add auto-version for remaining stx/update 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: I877a6c0802a707863a3b6c7d430146431e10a3ad
Story: 2008455
Task: 41459
Signed-off-by: Don Penney <don.penney@windriver.com>
---
 enable-dev-patch/centos/build_srpm.data                         | 2 +-
 patch-scripts/EXAMPLE_0001/centos/build_srpm.data               | 2 +-
 patch-scripts/EXAMPLE_0002/centos/build_srpm.data               | 2 +-
 patch-scripts/EXAMPLE_DC/centos/build_srpm.data                 | 2 +-
 patch-scripts/EXAMPLE_MTCE/centos/build_srpm.data               | 2 +-
 patch-scripts/EXAMPLE_RR/centos/build_srpm.data                 | 2 +-
 patch-scripts/EXAMPLE_SERVICE/centos/build_srpm.data            | 2 +-
 patch-scripts/EXAMPLE_SYSINV/centos/build_srpm.data             | 2 +-
 patch-scripts/EXAMPLE_VIM/centos/build_srpm.data                | 2 +-
 .../test-patches-suite-b/SUITE_B_KERNEL/centos/build_srpm.data  | 2 +-
 .../test-patches-suite-b/SUITE_B_PATCH_A/centos/build_srpm.data | 2 +-
 .../test-patches-suite-b/SUITE_B_PATCH_B/centos/build_srpm.data | 2 +-
 .../test-patches-suite-b/SUITE_B_PATCH_C/centos/build_srpm.data | 2 +-
 .../test-patches-suite-b/SUITE_B_PATCH_D/centos/build_srpm.data | 2 +-
 .../test-patches-suite-b/SUITE_B_PATCH_E/centos/build_srpm.data | 2 +-
 .../test-patches-suite-b/SUITE_B_PATCH_F/centos/build_srpm.data | 2 +-
 patch-scripts/test-patches/A/centos/build_srpm.data             | 2 +-
 patch-scripts/test-patches/B/centos/build_srpm.data             | 2 +-
 patch-scripts/test-patches/C/centos/build_srpm.data             | 2 +-
 .../test-patches/INSVC_ALLNODES/centos/build_srpm.data          | 2 +-
 patch-scripts/test-patches/INSVC_COMPUTE/centos/build_srpm.data | 2 +-
 .../test-patches/INSVC_CONTROLLER/centos/build_srpm.data        | 2 +-
 .../test-patches/INSVC_RESTART_FAILURE/centos/build_srpm.data   | 2 +-
 patch-scripts/test-patches/INSVC_STORAGE/centos/build_srpm.data | 2 +-
 patch-scripts/test-patches/LARGE/centos/build_srpm.data         | 2 +-
 patch-scripts/test-patches/RR_ALLNODES/centos/build_srpm.data   | 2 +-
 patch-scripts/test-patches/RR_COMPUTE/centos/build_srpm.data    | 2 +-
 patch-scripts/test-patches/RR_CONTROLLER/centos/build_srpm.data | 2 +-
 patch-scripts/test-patches/RR_STORAGE/centos/build_srpm.data    | 2 +-
 29 files changed, 29 insertions(+), 29 deletions(-)

diff --git a/enable-dev-patch/centos/build_srpm.data b/enable-dev-patch/centos/build_srpm.data
index ddd5493f..43e6617e 100644
--- a/enable-dev-patch/centos/build_srpm.data
+++ b/enable-dev-patch/centos/build_srpm.data
@@ -1,2 +1,2 @@
-TIS_PATCH_VER=1
+TIS_PATCH_VER=PKG_GITREVCOUNT
 COPY_LIST="enable-dev-patch/*"
diff --git a/patch-scripts/EXAMPLE_0001/centos/build_srpm.data b/patch-scripts/EXAMPLE_0001/centos/build_srpm.data
index ff906984..4e4d73ac 100644
--- a/patch-scripts/EXAMPLE_0001/centos/build_srpm.data
+++ b/patch-scripts/EXAMPLE_0001/centos/build_srpm.data
@@ -1,2 +1,2 @@
 COPY_LIST="scripts/*"
-TIS_PATCH_VER=0
+TIS_PATCH_VER=PKG_GITREVCOUNT
diff --git a/patch-scripts/EXAMPLE_0002/centos/build_srpm.data b/patch-scripts/EXAMPLE_0002/centos/build_srpm.data
index ff906984..4e4d73ac 100644
--- a/patch-scripts/EXAMPLE_0002/centos/build_srpm.data
+++ b/patch-scripts/EXAMPLE_0002/centos/build_srpm.data
@@ -1,2 +1,2 @@
 COPY_LIST="scripts/*"
-TIS_PATCH_VER=0
+TIS_PATCH_VER=PKG_GITREVCOUNT
diff --git a/patch-scripts/EXAMPLE_DC/centos/build_srpm.data b/patch-scripts/EXAMPLE_DC/centos/build_srpm.data
index 0a4d919c..c183737e 100644
--- a/patch-scripts/EXAMPLE_DC/centos/build_srpm.data
+++ b/patch-scripts/EXAMPLE_DC/centos/build_srpm.data
@@ -1,3 +1,3 @@
 COPY_LIST="scripts/*"
-TIS_PATCH_VER=1
+TIS_PATCH_VER=PKG_GITREVCOUNT
 
diff --git a/patch-scripts/EXAMPLE_MTCE/centos/build_srpm.data b/patch-scripts/EXAMPLE_MTCE/centos/build_srpm.data
index 6c396e7c..4e4d73ac 100644
--- a/patch-scripts/EXAMPLE_MTCE/centos/build_srpm.data
+++ b/patch-scripts/EXAMPLE_MTCE/centos/build_srpm.data
@@ -1,2 +1,2 @@
 COPY_LIST="scripts/*"
-TIS_PATCH_VER=1
+TIS_PATCH_VER=PKG_GITREVCOUNT
diff --git a/patch-scripts/EXAMPLE_RR/centos/build_srpm.data b/patch-scripts/EXAMPLE_RR/centos/build_srpm.data
index b12438cc..9e516f7f 100644
--- a/patch-scripts/EXAMPLE_RR/centos/build_srpm.data
+++ b/patch-scripts/EXAMPLE_RR/centos/build_srpm.data
@@ -1,2 +1,2 @@
 ALLOW_EMPTY_RPM=true
-TIS_PATCH_VER=0
+TIS_PATCH_VER=PKG_GITREVCOUNT
diff --git a/patch-scripts/EXAMPLE_SERVICE/centos/build_srpm.data b/patch-scripts/EXAMPLE_SERVICE/centos/build_srpm.data
index ff906984..4e4d73ac 100644
--- a/patch-scripts/EXAMPLE_SERVICE/centos/build_srpm.data
+++ b/patch-scripts/EXAMPLE_SERVICE/centos/build_srpm.data
@@ -1,2 +1,2 @@
 COPY_LIST="scripts/*"
-TIS_PATCH_VER=0
+TIS_PATCH_VER=PKG_GITREVCOUNT
diff --git a/patch-scripts/EXAMPLE_SYSINV/centos/build_srpm.data b/patch-scripts/EXAMPLE_SYSINV/centos/build_srpm.data
index 0a4d919c..c183737e 100644
--- a/patch-scripts/EXAMPLE_SYSINV/centos/build_srpm.data
+++ b/patch-scripts/EXAMPLE_SYSINV/centos/build_srpm.data
@@ -1,3 +1,3 @@
 COPY_LIST="scripts/*"
-TIS_PATCH_VER=1
+TIS_PATCH_VER=PKG_GITREVCOUNT
 
diff --git a/patch-scripts/EXAMPLE_VIM/centos/build_srpm.data b/patch-scripts/EXAMPLE_VIM/centos/build_srpm.data
index ff836a9a..1bc971c3 100644
--- a/patch-scripts/EXAMPLE_VIM/centos/build_srpm.data
+++ b/patch-scripts/EXAMPLE_VIM/centos/build_srpm.data
@@ -1,2 +1,2 @@
 COPY_LIST="scripts/*"
-TIS_PATCH_VER=3
+TIS_PATCH_VER=PKG_GITREVCOUNT+2
diff --git a/patch-scripts/test-patches-suite-b/SUITE_B_KERNEL/centos/build_srpm.data b/patch-scripts/test-patches-suite-b/SUITE_B_KERNEL/centos/build_srpm.data
index 23dfbf95..9e516f7f 100644
--- a/patch-scripts/test-patches-suite-b/SUITE_B_KERNEL/centos/build_srpm.data
+++ b/patch-scripts/test-patches-suite-b/SUITE_B_KERNEL/centos/build_srpm.data
@@ -1,2 +1,2 @@
 ALLOW_EMPTY_RPM=true
-TIS_PATCH_VER=19
+TIS_PATCH_VER=PKG_GITREVCOUNT
diff --git a/patch-scripts/test-patches-suite-b/SUITE_B_PATCH_A/centos/build_srpm.data b/patch-scripts/test-patches-suite-b/SUITE_B_PATCH_A/centos/build_srpm.data
index ff836a9a..4e4d73ac 100644
--- a/patch-scripts/test-patches-suite-b/SUITE_B_PATCH_A/centos/build_srpm.data
+++ b/patch-scripts/test-patches-suite-b/SUITE_B_PATCH_A/centos/build_srpm.data
@@ -1,2 +1,2 @@
 COPY_LIST="scripts/*"
-TIS_PATCH_VER=3
+TIS_PATCH_VER=PKG_GITREVCOUNT
diff --git a/patch-scripts/test-patches-suite-b/SUITE_B_PATCH_B/centos/build_srpm.data b/patch-scripts/test-patches-suite-b/SUITE_B_PATCH_B/centos/build_srpm.data
index ff836a9a..4e4d73ac 100644
--- a/patch-scripts/test-patches-suite-b/SUITE_B_PATCH_B/centos/build_srpm.data
+++ b/patch-scripts/test-patches-suite-b/SUITE_B_PATCH_B/centos/build_srpm.data
@@ -1,2 +1,2 @@
 COPY_LIST="scripts/*"
-TIS_PATCH_VER=3
+TIS_PATCH_VER=PKG_GITREVCOUNT
diff --git a/patch-scripts/test-patches-suite-b/SUITE_B_PATCH_C/centos/build_srpm.data b/patch-scripts/test-patches-suite-b/SUITE_B_PATCH_C/centos/build_srpm.data
index ff836a9a..4e4d73ac 100644
--- a/patch-scripts/test-patches-suite-b/SUITE_B_PATCH_C/centos/build_srpm.data
+++ b/patch-scripts/test-patches-suite-b/SUITE_B_PATCH_C/centos/build_srpm.data
@@ -1,2 +1,2 @@
 COPY_LIST="scripts/*"
-TIS_PATCH_VER=3
+TIS_PATCH_VER=PKG_GITREVCOUNT
diff --git a/patch-scripts/test-patches-suite-b/SUITE_B_PATCH_D/centos/build_srpm.data b/patch-scripts/test-patches-suite-b/SUITE_B_PATCH_D/centos/build_srpm.data
index ff836a9a..4e4d73ac 100644
--- a/patch-scripts/test-patches-suite-b/SUITE_B_PATCH_D/centos/build_srpm.data
+++ b/patch-scripts/test-patches-suite-b/SUITE_B_PATCH_D/centos/build_srpm.data
@@ -1,2 +1,2 @@
 COPY_LIST="scripts/*"
-TIS_PATCH_VER=3
+TIS_PATCH_VER=PKG_GITREVCOUNT
diff --git a/patch-scripts/test-patches-suite-b/SUITE_B_PATCH_E/centos/build_srpm.data b/patch-scripts/test-patches-suite-b/SUITE_B_PATCH_E/centos/build_srpm.data
index ff836a9a..4e4d73ac 100644
--- a/patch-scripts/test-patches-suite-b/SUITE_B_PATCH_E/centos/build_srpm.data
+++ b/patch-scripts/test-patches-suite-b/SUITE_B_PATCH_E/centos/build_srpm.data
@@ -1,2 +1,2 @@
 COPY_LIST="scripts/*"
-TIS_PATCH_VER=3
+TIS_PATCH_VER=PKG_GITREVCOUNT
diff --git a/patch-scripts/test-patches-suite-b/SUITE_B_PATCH_F/centos/build_srpm.data b/patch-scripts/test-patches-suite-b/SUITE_B_PATCH_F/centos/build_srpm.data
index ff836a9a..4e4d73ac 100644
--- a/patch-scripts/test-patches-suite-b/SUITE_B_PATCH_F/centos/build_srpm.data
+++ b/patch-scripts/test-patches-suite-b/SUITE_B_PATCH_F/centos/build_srpm.data
@@ -1,2 +1,2 @@
 COPY_LIST="scripts/*"
-TIS_PATCH_VER=3
+TIS_PATCH_VER=PKG_GITREVCOUNT
diff --git a/patch-scripts/test-patches/A/centos/build_srpm.data b/patch-scripts/test-patches/A/centos/build_srpm.data
index b12438cc..9e516f7f 100644
--- a/patch-scripts/test-patches/A/centos/build_srpm.data
+++ b/patch-scripts/test-patches/A/centos/build_srpm.data
@@ -1,2 +1,2 @@
 ALLOW_EMPTY_RPM=true
-TIS_PATCH_VER=0
+TIS_PATCH_VER=PKG_GITREVCOUNT
diff --git a/patch-scripts/test-patches/B/centos/build_srpm.data b/patch-scripts/test-patches/B/centos/build_srpm.data
index b12438cc..9e516f7f 100644
--- a/patch-scripts/test-patches/B/centos/build_srpm.data
+++ b/patch-scripts/test-patches/B/centos/build_srpm.data
@@ -1,2 +1,2 @@
 ALLOW_EMPTY_RPM=true
-TIS_PATCH_VER=0
+TIS_PATCH_VER=PKG_GITREVCOUNT
diff --git a/patch-scripts/test-patches/C/centos/build_srpm.data b/patch-scripts/test-patches/C/centos/build_srpm.data
index b12438cc..9e516f7f 100644
--- a/patch-scripts/test-patches/C/centos/build_srpm.data
+++ b/patch-scripts/test-patches/C/centos/build_srpm.data
@@ -1,2 +1,2 @@
 ALLOW_EMPTY_RPM=true
-TIS_PATCH_VER=0
+TIS_PATCH_VER=PKG_GITREVCOUNT
diff --git a/patch-scripts/test-patches/INSVC_ALLNODES/centos/build_srpm.data b/patch-scripts/test-patches/INSVC_ALLNODES/centos/build_srpm.data
index ff906984..4e4d73ac 100644
--- a/patch-scripts/test-patches/INSVC_ALLNODES/centos/build_srpm.data
+++ b/patch-scripts/test-patches/INSVC_ALLNODES/centos/build_srpm.data
@@ -1,2 +1,2 @@
 COPY_LIST="scripts/*"
-TIS_PATCH_VER=0
+TIS_PATCH_VER=PKG_GITREVCOUNT
diff --git a/patch-scripts/test-patches/INSVC_COMPUTE/centos/build_srpm.data b/patch-scripts/test-patches/INSVC_COMPUTE/centos/build_srpm.data
index ff906984..4e4d73ac 100644
--- a/patch-scripts/test-patches/INSVC_COMPUTE/centos/build_srpm.data
+++ b/patch-scripts/test-patches/INSVC_COMPUTE/centos/build_srpm.data
@@ -1,2 +1,2 @@
 COPY_LIST="scripts/*"
-TIS_PATCH_VER=0
+TIS_PATCH_VER=PKG_GITREVCOUNT
diff --git a/patch-scripts/test-patches/INSVC_CONTROLLER/centos/build_srpm.data b/patch-scripts/test-patches/INSVC_CONTROLLER/centos/build_srpm.data
index ff906984..4e4d73ac 100644
--- a/patch-scripts/test-patches/INSVC_CONTROLLER/centos/build_srpm.data
+++ b/patch-scripts/test-patches/INSVC_CONTROLLER/centos/build_srpm.data
@@ -1,2 +1,2 @@
 COPY_LIST="scripts/*"
-TIS_PATCH_VER=0
+TIS_PATCH_VER=PKG_GITREVCOUNT
diff --git a/patch-scripts/test-patches/INSVC_RESTART_FAILURE/centos/build_srpm.data b/patch-scripts/test-patches/INSVC_RESTART_FAILURE/centos/build_srpm.data
index ff906984..4e4d73ac 100644
--- a/patch-scripts/test-patches/INSVC_RESTART_FAILURE/centos/build_srpm.data
+++ b/patch-scripts/test-patches/INSVC_RESTART_FAILURE/centos/build_srpm.data
@@ -1,2 +1,2 @@
 COPY_LIST="scripts/*"
-TIS_PATCH_VER=0
+TIS_PATCH_VER=PKG_GITREVCOUNT
diff --git a/patch-scripts/test-patches/INSVC_STORAGE/centos/build_srpm.data b/patch-scripts/test-patches/INSVC_STORAGE/centos/build_srpm.data
index ff906984..4e4d73ac 100644
--- a/patch-scripts/test-patches/INSVC_STORAGE/centos/build_srpm.data
+++ b/patch-scripts/test-patches/INSVC_STORAGE/centos/build_srpm.data
@@ -1,2 +1,2 @@
 COPY_LIST="scripts/*"
-TIS_PATCH_VER=0
+TIS_PATCH_VER=PKG_GITREVCOUNT
diff --git a/patch-scripts/test-patches/LARGE/centos/build_srpm.data b/patch-scripts/test-patches/LARGE/centos/build_srpm.data
index b12438cc..9e516f7f 100644
--- a/patch-scripts/test-patches/LARGE/centos/build_srpm.data
+++ b/patch-scripts/test-patches/LARGE/centos/build_srpm.data
@@ -1,2 +1,2 @@
 ALLOW_EMPTY_RPM=true
-TIS_PATCH_VER=0
+TIS_PATCH_VER=PKG_GITREVCOUNT
diff --git a/patch-scripts/test-patches/RR_ALLNODES/centos/build_srpm.data b/patch-scripts/test-patches/RR_ALLNODES/centos/build_srpm.data
index b12438cc..9e516f7f 100644
--- a/patch-scripts/test-patches/RR_ALLNODES/centos/build_srpm.data
+++ b/patch-scripts/test-patches/RR_ALLNODES/centos/build_srpm.data
@@ -1,2 +1,2 @@
 ALLOW_EMPTY_RPM=true
-TIS_PATCH_VER=0
+TIS_PATCH_VER=PKG_GITREVCOUNT
diff --git a/patch-scripts/test-patches/RR_COMPUTE/centos/build_srpm.data b/patch-scripts/test-patches/RR_COMPUTE/centos/build_srpm.data
index b12438cc..9e516f7f 100644
--- a/patch-scripts/test-patches/RR_COMPUTE/centos/build_srpm.data
+++ b/patch-scripts/test-patches/RR_COMPUTE/centos/build_srpm.data
@@ -1,2 +1,2 @@
 ALLOW_EMPTY_RPM=true
-TIS_PATCH_VER=0
+TIS_PATCH_VER=PKG_GITREVCOUNT
diff --git a/patch-scripts/test-patches/RR_CONTROLLER/centos/build_srpm.data b/patch-scripts/test-patches/RR_CONTROLLER/centos/build_srpm.data
index b12438cc..9e516f7f 100644
--- a/patch-scripts/test-patches/RR_CONTROLLER/centos/build_srpm.data
+++ b/patch-scripts/test-patches/RR_CONTROLLER/centos/build_srpm.data
@@ -1,2 +1,2 @@
 ALLOW_EMPTY_RPM=true
-TIS_PATCH_VER=0
+TIS_PATCH_VER=PKG_GITREVCOUNT
diff --git a/patch-scripts/test-patches/RR_STORAGE/centos/build_srpm.data b/patch-scripts/test-patches/RR_STORAGE/centos/build_srpm.data
index b12438cc..9e516f7f 100644
--- a/patch-scripts/test-patches/RR_STORAGE/centos/build_srpm.data
+++ b/patch-scripts/test-patches/RR_STORAGE/centos/build_srpm.data
@@ -1,2 +1,2 @@
 ALLOW_EMPTY_RPM=true
-TIS_PATCH_VER=0
+TIS_PATCH_VER=PKG_GITREVCOUNT