diff --git a/base/rsync/centos/build_srpm.data b/base/rsync/centos/build_srpm.data deleted file mode 100644 index 69cb924ed..000000000 --- a/base/rsync/centos/build_srpm.data +++ /dev/null @@ -1,2 +0,0 @@ -COPY_LIST="$PKG_BASE/files/rsyncd.conf" -TIS_PATCH_VER=2 diff --git a/base/rsync/centos/meta_patches/0001-Update-package-versioning-for-TIS-format.patch b/base/rsync/centos/meta_patches/0001-Update-package-versioning-for-TIS-format.patch deleted file mode 100644 index 16dd763e5..000000000 --- a/base/rsync/centos/meta_patches/0001-Update-package-versioning-for-TIS-format.patch +++ /dev/null @@ -1,27 +0,0 @@ -From a6709dfc64368bac4970e3b99512a4e1b4b8e756 Mon Sep 17 00:00:00 2001 -From: Scott Little -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 - diff --git a/base/rsync/centos/meta_patches/PATCH_ORDER b/base/rsync/centos/meta_patches/PATCH_ORDER deleted file mode 100644 index 91f9a80ea..000000000 --- a/base/rsync/centos/meta_patches/PATCH_ORDER +++ /dev/null @@ -1 +0,0 @@ -0001-Update-package-versioning-for-TIS-format.patch diff --git a/base/rsync/centos/srpm_path b/base/rsync/centos/srpm_path deleted file mode 100644 index 211d97f95..000000000 --- a/base/rsync/centos/srpm_path +++ /dev/null @@ -1 +0,0 @@ -mirror:Source/rsync-3.1.2-4.el7.src.rpm diff --git a/base/rsync/files/rsyncd b/base/rsync/files/rsyncd deleted file mode 100755 index df550bad2..000000000 --- a/base/rsync/files/rsyncd +++ /dev/null @@ -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 diff --git a/centos_iso_image.inc b/centos_iso_image.inc index 4396e81f1..9f15ae051 100644 --- a/centos_iso_image.inc +++ b/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 @@ -307,9 +308,6 @@ dnsmasq dnsmasq-utils dnsmasq-config -# rsync -rsync - # parted parted diff --git a/centos_pkg_dirs b/centos_pkg_dirs index c0d15a7db..04f57d7ce 100644 --- a/centos_pkg_dirs +++ b/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 @@ -141,7 +142,6 @@ database/python-psycopg2 base/crontabs base/dnsmasq base/dnsmasq-config -base/rsync filesystem/parted security/python-keyring grub/grub2 diff --git a/config-files/rsync-config/centos/build_srpm.data b/config-files/rsync-config/centos/build_srpm.data new file mode 100644 index 000000000..2c3b2cb8b --- /dev/null +++ b/config-files/rsync-config/centos/build_srpm.data @@ -0,0 +1,2 @@ +SRC_DIR="files" +TIS_PATCH_VER=1 diff --git a/config-files/rsync-config/centos/rsync-config.spec b/config-files/rsync-config/centos/rsync-config.spec new file mode 100644 index 000000000..5701277e3 --- /dev/null +++ b/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 diff --git a/base/rsync/files/rsyncd.conf b/config-files/rsync-config/files/rsyncd.conf similarity index 100% rename from base/rsync/files/rsyncd.conf rename to config-files/rsync-config/files/rsyncd.conf