From 826a2b36b7902e2d92fdd75a165780f1a97bc2cb Mon Sep 17 00:00:00 2001 From: Don Penney Date: Thu, 17 Dec 2020 13:27:31 -0500 Subject: [PATCH] Add auto-version for remaining stx/config-files 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: I70d0ee9dcff9dc3f6365a63d4926bc2a1b6f628b Story: 2008455 Task: 41449 Signed-off-by: Don Penney --- audit-config/centos/build_srpm.data | 2 +- centos-release-config/centos/build_srpm.data | 2 +- containerd-config/centos/build_srpm.data | 2 +- dhcp-config/centos/build_srpm.data | 2 +- dnsmasq-config/centos/build_srpm.data | 2 +- docker-config/centos/build_srpm.data | 2 +- filesystem-scripts/centos/build_srpm.data | 2 +- haproxy-config/centos/build_srpm.data | 2 +- initscripts-config/centos/build_srpm.data | 2 +- io-scheduler/centos/build_srpm.data | 2 +- iptables-config/centos/build_srpm.data | 2 +- iscsi-initiator-utils-config/centos/build_srpm.data | 2 +- lighttpd-config/centos/build_srpm.data | 2 +- logrotate-config/centos/build_srpm.data | 2 +- memcached-custom/centos/build_srpm.data | 2 +- mlx4-config/centos/build_srpm.data | 2 +- net-snmp-config/centos/build_srpm.data | 2 +- nfs-utils-config/centos/build_srpm.data | 2 +- ntp-config/centos/build_srpm.data | 2 +- openldap-config/centos/build_srpm.data | 2 +- openssh-config/centos/build_srpm.data | 2 +- openvswitch-config/centos/build_srpm.data | 2 +- pam-config/centos/build_srpm.data | 2 +- rsync-config/centos/build_srpm.data | 2 +- setup-config/centos/build_srpm.data | 2 +- shadow-utils-config/centos/build_srpm.data | 2 +- sudo-config/centos/build_srpm.data | 2 +- systemd-config/centos/build_srpm.data | 2 +- util-linux-config/centos/build_srpm.data | 2 +- 29 files changed, 29 insertions(+), 29 deletions(-) diff --git a/audit-config/centos/build_srpm.data b/audit-config/centos/build_srpm.data index da1e20b..b074089 100644 --- a/audit-config/centos/build_srpm.data +++ b/audit-config/centos/build_srpm.data @@ -1,2 +1,2 @@ SRC_DIR="files" -TIS_PATCH_VER=0 +TIS_PATCH_VER=PKG_GITREVCOUNT diff --git a/centos-release-config/centos/build_srpm.data b/centos-release-config/centos/build_srpm.data index 2c3b2cb..b074089 100644 --- a/centos-release-config/centos/build_srpm.data +++ b/centos-release-config/centos/build_srpm.data @@ -1,2 +1,2 @@ SRC_DIR="files" -TIS_PATCH_VER=1 +TIS_PATCH_VER=PKG_GITREVCOUNT diff --git a/containerd-config/centos/build_srpm.data b/containerd-config/centos/build_srpm.data index 15dbe0d..2dcf45a 100644 --- a/containerd-config/centos/build_srpm.data +++ b/containerd-config/centos/build_srpm.data @@ -1,2 +1,2 @@ SRC_DIR="$PKG_BASE/files" -TIS_PATCH_VER=1 +TIS_PATCH_VER=PKG_GITREVCOUNT diff --git a/dhcp-config/centos/build_srpm.data b/dhcp-config/centos/build_srpm.data index 75f295c..b074089 100644 --- a/dhcp-config/centos/build_srpm.data +++ b/dhcp-config/centos/build_srpm.data @@ -1,2 +1,2 @@ SRC_DIR="files" -TIS_PATCH_VER=2 +TIS_PATCH_VER=PKG_GITREVCOUNT diff --git a/dnsmasq-config/centos/build_srpm.data b/dnsmasq-config/centos/build_srpm.data index 2c3b2cb..b074089 100644 --- a/dnsmasq-config/centos/build_srpm.data +++ b/dnsmasq-config/centos/build_srpm.data @@ -1,2 +1,2 @@ SRC_DIR="files" -TIS_PATCH_VER=1 +TIS_PATCH_VER=PKG_GITREVCOUNT diff --git a/docker-config/centos/build_srpm.data b/docker-config/centos/build_srpm.data index 1ecddec..2dcf45a 100644 --- a/docker-config/centos/build_srpm.data +++ b/docker-config/centos/build_srpm.data @@ -1,2 +1,2 @@ SRC_DIR="$PKG_BASE/files" -TIS_PATCH_VER=2 +TIS_PATCH_VER=PKG_GITREVCOUNT diff --git a/filesystem-scripts/centos/build_srpm.data b/filesystem-scripts/centos/build_srpm.data index 04f8d4f..acff2a4 100644 --- a/filesystem-scripts/centos/build_srpm.data +++ b/filesystem-scripts/centos/build_srpm.data @@ -1,3 +1,3 @@ SRC_DIR="filesystem-scripts-1.0" COPY_LIST="$PKG_BASE/LICENSE" -TIS_PATCH_VER=2 +TIS_PATCH_VER=PKG_GITREVCOUNT diff --git a/haproxy-config/centos/build_srpm.data b/haproxy-config/centos/build_srpm.data index 2c3b2cb..b074089 100644 --- a/haproxy-config/centos/build_srpm.data +++ b/haproxy-config/centos/build_srpm.data @@ -1,2 +1,2 @@ SRC_DIR="files" -TIS_PATCH_VER=1 +TIS_PATCH_VER=PKG_GITREVCOUNT diff --git a/initscripts-config/centos/build_srpm.data b/initscripts-config/centos/build_srpm.data index 2c3b2cb..b074089 100644 --- a/initscripts-config/centos/build_srpm.data +++ b/initscripts-config/centos/build_srpm.data @@ -1,2 +1,2 @@ SRC_DIR="files" -TIS_PATCH_VER=1 +TIS_PATCH_VER=PKG_GITREVCOUNT diff --git a/io-scheduler/centos/build_srpm.data b/io-scheduler/centos/build_srpm.data index abc7209..7f0b84d 100644 --- a/io-scheduler/centos/build_srpm.data +++ b/io-scheduler/centos/build_srpm.data @@ -1,2 +1,2 @@ COPY_LIST="$FILES_BASE/*" -TIS_PATCH_VER=0 +TIS_PATCH_VER=PKG_GITREVCOUNT diff --git a/iptables-config/centos/build_srpm.data b/iptables-config/centos/build_srpm.data index da1e20b..b074089 100644 --- a/iptables-config/centos/build_srpm.data +++ b/iptables-config/centos/build_srpm.data @@ -1,2 +1,2 @@ SRC_DIR="files" -TIS_PATCH_VER=0 +TIS_PATCH_VER=PKG_GITREVCOUNT diff --git a/iscsi-initiator-utils-config/centos/build_srpm.data b/iscsi-initiator-utils-config/centos/build_srpm.data index da1e20b..b074089 100644 --- a/iscsi-initiator-utils-config/centos/build_srpm.data +++ b/iscsi-initiator-utils-config/centos/build_srpm.data @@ -1,2 +1,2 @@ SRC_DIR="files" -TIS_PATCH_VER=0 +TIS_PATCH_VER=PKG_GITREVCOUNT diff --git a/lighttpd-config/centos/build_srpm.data b/lighttpd-config/centos/build_srpm.data index 75f295c..b074089 100644 --- a/lighttpd-config/centos/build_srpm.data +++ b/lighttpd-config/centos/build_srpm.data @@ -1,2 +1,2 @@ SRC_DIR="files" -TIS_PATCH_VER=2 +TIS_PATCH_VER=PKG_GITREVCOUNT diff --git a/logrotate-config/centos/build_srpm.data b/logrotate-config/centos/build_srpm.data index da1e20b..b074089 100644 --- a/logrotate-config/centos/build_srpm.data +++ b/logrotate-config/centos/build_srpm.data @@ -1,2 +1,2 @@ SRC_DIR="files" -TIS_PATCH_VER=0 +TIS_PATCH_VER=PKG_GITREVCOUNT diff --git a/memcached-custom/centos/build_srpm.data b/memcached-custom/centos/build_srpm.data index 2c3b2cb..b074089 100644 --- a/memcached-custom/centos/build_srpm.data +++ b/memcached-custom/centos/build_srpm.data @@ -1,2 +1,2 @@ SRC_DIR="files" -TIS_PATCH_VER=1 +TIS_PATCH_VER=PKG_GITREVCOUNT diff --git a/mlx4-config/centos/build_srpm.data b/mlx4-config/centos/build_srpm.data index 57d0e0e..5fda6b8 100644 --- a/mlx4-config/centos/build_srpm.data +++ b/mlx4-config/centos/build_srpm.data @@ -1,4 +1,4 @@ COPY_LIST=" \ $PKG_BASE/files/* \ " -TIS_PATCH_VER=2 +TIS_PATCH_VER=PKG_GITREVCOUNT diff --git a/net-snmp-config/centos/build_srpm.data b/net-snmp-config/centos/build_srpm.data index da1e20b..b074089 100644 --- a/net-snmp-config/centos/build_srpm.data +++ b/net-snmp-config/centos/build_srpm.data @@ -1,2 +1,2 @@ SRC_DIR="files" -TIS_PATCH_VER=0 +TIS_PATCH_VER=PKG_GITREVCOUNT diff --git a/nfs-utils-config/centos/build_srpm.data b/nfs-utils-config/centos/build_srpm.data index 2c3b2cb..b074089 100644 --- a/nfs-utils-config/centos/build_srpm.data +++ b/nfs-utils-config/centos/build_srpm.data @@ -1,2 +1,2 @@ SRC_DIR="files" -TIS_PATCH_VER=1 +TIS_PATCH_VER=PKG_GITREVCOUNT diff --git a/ntp-config/centos/build_srpm.data b/ntp-config/centos/build_srpm.data index 7e7b60e..c3c7e23 100644 --- a/ntp-config/centos/build_srpm.data +++ b/ntp-config/centos/build_srpm.data @@ -1,2 +1,2 @@ COPY_LIST="files/*" -TIS_PATCH_VER=0 +TIS_PATCH_VER=PKG_GITREVCOUNT diff --git a/openldap-config/centos/build_srpm.data b/openldap-config/centos/build_srpm.data index 2c3b2cb..b074089 100644 --- a/openldap-config/centos/build_srpm.data +++ b/openldap-config/centos/build_srpm.data @@ -1,2 +1,2 @@ SRC_DIR="files" -TIS_PATCH_VER=1 +TIS_PATCH_VER=PKG_GITREVCOUNT diff --git a/openssh-config/centos/build_srpm.data b/openssh-config/centos/build_srpm.data index da1e20b..b074089 100644 --- a/openssh-config/centos/build_srpm.data +++ b/openssh-config/centos/build_srpm.data @@ -1,2 +1,2 @@ SRC_DIR="files" -TIS_PATCH_VER=0 +TIS_PATCH_VER=PKG_GITREVCOUNT diff --git a/openvswitch-config/centos/build_srpm.data b/openvswitch-config/centos/build_srpm.data index 2c3b2cb..b074089 100644 --- a/openvswitch-config/centos/build_srpm.data +++ b/openvswitch-config/centos/build_srpm.data @@ -1,2 +1,2 @@ SRC_DIR="files" -TIS_PATCH_VER=1 +TIS_PATCH_VER=PKG_GITREVCOUNT diff --git a/pam-config/centos/build_srpm.data b/pam-config/centos/build_srpm.data index 2c3b2cb..b074089 100644 --- a/pam-config/centos/build_srpm.data +++ b/pam-config/centos/build_srpm.data @@ -1,2 +1,2 @@ SRC_DIR="files" -TIS_PATCH_VER=1 +TIS_PATCH_VER=PKG_GITREVCOUNT diff --git a/rsync-config/centos/build_srpm.data b/rsync-config/centos/build_srpm.data index 2c3b2cb..b074089 100644 --- a/rsync-config/centos/build_srpm.data +++ b/rsync-config/centos/build_srpm.data @@ -1,2 +1,2 @@ SRC_DIR="files" -TIS_PATCH_VER=1 +TIS_PATCH_VER=PKG_GITREVCOUNT diff --git a/setup-config/centos/build_srpm.data b/setup-config/centos/build_srpm.data index 2c3b2cb..b074089 100644 --- a/setup-config/centos/build_srpm.data +++ b/setup-config/centos/build_srpm.data @@ -1,2 +1,2 @@ SRC_DIR="files" -TIS_PATCH_VER=1 +TIS_PATCH_VER=PKG_GITREVCOUNT diff --git a/shadow-utils-config/centos/build_srpm.data b/shadow-utils-config/centos/build_srpm.data index 7e7b60e..c3c7e23 100644 --- a/shadow-utils-config/centos/build_srpm.data +++ b/shadow-utils-config/centos/build_srpm.data @@ -1,2 +1,2 @@ COPY_LIST="files/*" -TIS_PATCH_VER=0 +TIS_PATCH_VER=PKG_GITREVCOUNT diff --git a/sudo-config/centos/build_srpm.data b/sudo-config/centos/build_srpm.data index 2ec7ea0..c3c7e23 100644 --- a/sudo-config/centos/build_srpm.data +++ b/sudo-config/centos/build_srpm.data @@ -1,2 +1,2 @@ COPY_LIST="files/*" -TIS_PATCH_VER=1 +TIS_PATCH_VER=PKG_GITREVCOUNT diff --git a/systemd-config/centos/build_srpm.data b/systemd-config/centos/build_srpm.data index 75f295c..b074089 100644 --- a/systemd-config/centos/build_srpm.data +++ b/systemd-config/centos/build_srpm.data @@ -1,2 +1,2 @@ SRC_DIR="files" -TIS_PATCH_VER=2 +TIS_PATCH_VER=PKG_GITREVCOUNT diff --git a/util-linux-config/centos/build_srpm.data b/util-linux-config/centos/build_srpm.data index da1e20b..b074089 100644 --- a/util-linux-config/centos/build_srpm.data +++ b/util-linux-config/centos/build_srpm.data @@ -1,2 +1,2 @@ SRC_DIR="files" -TIS_PATCH_VER=0 +TIS_PATCH_VER=PKG_GITREVCOUNT