Refactor patches for rsync package

Use rsync-config package to package rsyncd.conf file for rsync
package.
Remove rsync package folder and use RPM instead of SRPM for rsync.

Deployment test and ping test between VMs pass
Config file check pass.

Story: 2003768
Task: 27590
Depends-on: https://review.openstack.org/#/c/617447/

Change-Id: Ic5aeec585774917bb4b25c08fe1a4fa5a3e7d77c

base/rsync/centos/build_srpm.data

@@ -1,2 +0,0 @@
-COPY_LIST="$PKG_BASE/files/rsyncd.conf"
-TIS_PATCH_VER=2

base/rsync/centos/meta_patches/0001-Update-package-versioning-for-TIS-format.patch

@@ -1,27 +0,0 @@
-From a6709dfc64368bac4970e3b99512a4e1b4b8e756 Mon Sep 17 00:00:00 2001
-From: Scott Little <scott.little@windriver.com>
-Date: Mon, 2 Oct 2017 16:32:24 -0400
-Subject: [PATCH] WRS: 0001-Update-package-versioning-for-TIS-format.patch
-
-Conflicts:
-	SPECS/rsync.spec
----
- SPECS/rsync.spec | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/SPECS/rsync.spec b/SPECS/rsync.spec
-index d5f6d55..d9cb5ed 100644
---- a/SPECS/rsync.spec
-+++ b/SPECS/rsync.spec
-@@ -8,7 +8,7 @@
- Summary: A program for synchronizing files over a network
- Name: rsync
- Version: 3.1.2
--Release: 4%{?prerelease}%{?dist}
-+Release: 4.el7%{?_tis_dist}.%{tis_patch_ver}
- Group: Applications/Internet
- URL: http://rsync.samba.org/
- 
--- 
-2.7.4
-

base/rsync/centos/meta_patches/PATCH_ORDER

@@ -1 +0,0 @@
-0001-Update-package-versioning-for-TIS-format.patch

base/rsync/centos/srpm_path

@@ -1 +0,0 @@
-mirror:Source/rsync-3.1.2-4.el7.src.rpm

base/rsync/files/rsyncd

@@ -1,93 +0,0 @@
-#!/bin/sh
-
-### BEGIN INIT INFO
-# Provides:          rsyncd
-# Default-Start:     2 3 4 5
-# Default-Stop:      0 1 6
-# Short-Description: RSYNC daemon
-# Description:       RSYNC daemon
-### END INIT INFO
-
-DESC="rsyncd"
-DAEMON="/usr/bin/rsync"
-RUNDIR="/var/run"
-PIDFILE="${RUNDIR}/rsyncd.pid"
-OPTIONS="--daemon --config=/etc/rsyncd.conf"
-
-
-start()
-{
-    if [ -e $PIDFILE ]; then
-        PIDDIR=/proc/$(cat $PIDFILE)
-        if [ -d ${PIDDIR} ]; then
-            echo "$DESC already running."
-            exit 0
-        else
-            echo "Removing stale PID file $PIDFILE"
-            rm -f $PIDFILE
-        fi
-    fi
-
-    echo -n "Starting $DESC..."
-    mkdir -p $RUNDIR
-    start-stop-daemon --start --quiet --background \
-        --pidfile ${PIDFILE} --exec ${DAEMON} \
-        -- $OPTIONS
-
-    if [ $? -eq 0 ]; then
-        echo "done."
-    else
-        echo "failed."
-        exit 1
-    fi
-}
-
-stop() 
-{
-    echo -n "Stopping $DESC..."
-    start-stop-daemon --stop --quiet --pidfile $PIDFILE
-    if [ $? -eq 0 ]; then
-        echo "done."
-    else
-        echo "failed."
-    fi
-    rm -f $PIDFILE
-}
-
-status()
-{
-    pid=`cat $PIDFILE 2>/dev/null`
-    if [ -n "$pid" ]; then
-        if ps -p $pid &>/dev/null ; then
-            echo "$DESC is running"
-            exit 0
-        else
-            echo "$DESC is not running but has pid file"
-            exit 1
-        fi
-    fi
-    echo "$DESC is not running"
-    exit 3
-}
-
-case "$1" in
-    start)
-        start
-        ;;
-    stop)
-        stop
-        ;;
-    restart|force-reload|reload)
-        stop
-        start
-        ;;
-    status)
-        status
-        ;;
-    *)
-        echo "Usage: $0 {start|stop|force-reload|restart|reload|status}"
-        exit 1
-        ;;
-esac
-
-exit 0

centos_iso_image.inc

@@ -224,6 +224,7 @@ sudo-config
 shadow-utils-config
 ntp-config
 syslog-ng-config
+rsync-config
 
 # net-snmp
 net-snmp-utils
@@ -306,9 +307,6 @@ dnsmasq
 dnsmasq-utils
 dnsmasq-config
 
-# rsync
-rsync
-
 # parted
 parted
 

centos_pkg_dirs

@@ -109,6 +109,7 @@ config-files/audit-config
 config-files/shadow-utils-config
 config-files/ntp-config
 config-files/syslog-ng-config
+config-files/rsync-config
 tools/collector
 grub/grubby
 utilities/platform-util
@@ -140,7 +141,6 @@ database/python-psycopg2
 base/crontabs
 base/dnsmasq
 base/dnsmasq-config
-base/rsync
 filesystem/parted
 security/python-keyring
 grub/grub2

config-files/rsync-config/centos/build_srpm.data

@@ -0,0 +1,2 @@
+SRC_DIR="files"
+TIS_PATCH_VER=1

config-files/rsync-config/centos/rsync-config.spec

@@ -0,0 +1,34 @@
+Summary: rsync-config
+Name: rsync-config
+Version: 1.0
+Release: %{tis_patch_ver}%{?_tis_dist}
+License: Apache-2.0
+Group: base
+Packager: StarlingX
+URL: unknown
+BuildArch: noarch
+Source: %name-%version.tar.gz
+
+Requires: rsync
+Summary: package StarlingX configuration files of rsync to system folder.
+
+%description
+package StarlingX configuration files of rsync to system folder.
+
+%prep
+%setup
+
+%build
+
+%install
+%{__install} -d  %{buildroot}%{_datadir}/starlingx/
+%{__install} -m 644 rsyncd.conf  %{buildroot}%{_datadir}/starlingx/stx.rsyncd.conf
+
+%post
+if [ $1 -eq 1 ] ; then
+        # Initial installation
+        cp -f %{_datadir}/starlingx/stx.rsyncd.conf  %{_sysconfdir}/rsyncd.conf
+fi
+
+%files
+%{_datadir}/starlingx/stx.rsyncd.conf