do not kill the caRepeater on update because that would kill dependent services like caCateways
This commit is contained in:
@@ -5,7 +5,7 @@
|
||||
Name: epics-base-%{EpicsVersion}
|
||||
Summary: EPICS Base %{EpicsVersion}
|
||||
Version: 1
|
||||
Release: 5%{?dist}
|
||||
Release: 6%{?dist}
|
||||
License: EPICS Open License
|
||||
Group: Development/Languages
|
||||
URL: https://git.psi.ch/epics_base/base-7.0
|
||||
@@ -186,7 +186,7 @@ git submodule update --init --recursive modules
|
||||
%if %{defined epics_host_arch}
|
||||
export EPICS_HOST_ARCH=%{epics_host_arch}
|
||||
%endif
|
||||
%{__make} -j $RPM_BUILD_NCPUS INSTALL_LOCATION=%{buildroot}/%{prog_folder} FINAL_LOCATION=%{prog_folder}
|
||||
%{__make} INSTALL_LOCATION=%{buildroot}/%{prog_folder} FINAL_LOCATION=%{prog_folder}
|
||||
%{__make} INSTALL_LOCATION=%{buildroot}/%{prog_folder} copysrc
|
||||
|
||||
# remove files we do not need
|
||||
@@ -217,11 +217,9 @@ fi
|
||||
SYSTEMD_DIR=$(pkg-config systemd --variable=systemdsystemunitdir)
|
||||
if [ -n "$SYSTEMD_DIR" ]
|
||||
then
|
||||
systemctl is-enabled caRepeater.service 2>/dev/null && systemctl disable --now caRepeater.service
|
||||
test -e $SYSTEMD_DIR/caRepeater.service && %{__rm} $SYSTEMD_DIR/caRepeater.service
|
||||
test -e $SYSTEMD_DIR/caRepeater.service && %{__rm} $SYSTEMD_DIR/caRepeater.service
|
||||
%{__ln_s} "$(/usr/bin/ls -dvr1 /usr/local/epics/base-+([0-9]).+([0-9]).+([0-9])/bin/%{epics_host_arch}/caRepeater.service | /usr/bin/head -n1)" $SYSTEMD_DIR/
|
||||
systemctl daemon-reload
|
||||
killall caRepeater 2>/dev/null
|
||||
systemctl enable --now caRepeater.service
|
||||
fi
|
||||
|
||||
@@ -237,15 +235,9 @@ fi
|
||||
SYSTEMD_DIR=$(pkg-config systemd --variable=systemdsystemunitdir)
|
||||
if [ -n "$SYSTEMD_DIR" ]
|
||||
then
|
||||
systemctl disable --now caRepeater.service
|
||||
%{__rm} -f $SYSTEMD_DIR/caRepeater.service
|
||||
%{__ln_s} "$(/usr/bin/ls -dvr1 /usr/local/epics/base-+([0-9]).+([0-9]).+([0-9])/bin/%{epics_host_arch}/caRepeater.service 2>/dev/null | /usr/bin/head -n1)" $SYSTEMD_DIR/ 2>/dev/null
|
||||
systemctl daemon-reload
|
||||
if [ -e $SYSTEMD_DIR/caRepeater.service ]
|
||||
then
|
||||
killall caRepeater 2>/dev/null
|
||||
systemctl enable --now caRepeater.service
|
||||
fi
|
||||
fi
|
||||
|
||||
%files
|
||||
|
||||
Reference in New Issue
Block a user