Skip to content
Snippets Groups Projects
Commit 5490b994 authored by Felip Moll's avatar Felip Moll Committed by Danny Auble
Browse files

Add slurmsmwd to legacy spec file to avoid warnings

Bug 5748
parent 6ba6209b
No related branches found
No related tags found
No related merge requests found
......@@ -48,6 +48,7 @@ documents those changes that are of interest to users and administrators.
-- Fix correct job CPU count allocated.
-- Protect against sending to the slurmdbd if the connection has gone away.
-- Fix checking missing return codes when unpacking structures.
-- Fix slurm.spec-legacy including slurmsmwd
 
* Changes in Slurm 17.11.9-2
============================
......
......@@ -367,6 +367,17 @@ running on the node, or any user who has allocated resources on the node
according to the Slurm
%endif
%if %{with cray}
%package slurmsmwd
Summary: support daemons and software for the Cray SMW
Group: System Environment/Base
Requires: %{name}%{?_isa} = %{version}-%{release}
Obsoletes: craysmw
%description slurmsmwd
support daeamons and software for the Cray SMW. Includes slurmsmwd which
notifies slurm about failed nodes.
%endif
#############################################################################
%prep
......@@ -420,6 +431,9 @@ if [ -d /usr/lib/systemd/system ]; then
install -D -m644 etc/slurmctld.service $RPM_BUILD_ROOT/usr/lib/systemd/system/slurmctld.service
install -D -m644 etc/slurmd.service $RPM_BUILD_ROOT/usr/lib/systemd/system/slurmd.service
install -D -m644 etc/slurmdbd.service $RPM_BUILD_ROOT/usr/lib/systemd/system/slurmdbd.service
%if %{slurm_with cray}
install -D -m644 contribs/cray/slurmsmwd/slurmsmwd.service %{buildroot}/%{_unitdir}/slurmsmwd.service
%endif
elif [ -d /etc/init.d ]; then
install -D -m755 etc/init.d.slurm $RPM_BUILD_ROOT/etc/init.d/slurm
install -D -m755 etc/init.d.slurmdbd $RPM_BUILD_ROOT/etc/init.d/slurmdbd
......@@ -440,11 +454,13 @@ fi
echo -e '#%Module\nset ModulesVersion "%{version}-%{rel}"' > $RPM_BUILD_ROOT/opt/modulefiles/slurm/.version
%else
rm -f contribs/cray/opt_modulefiles_slurm
rm -f contribs/cray/slurmsmwd/slurmsmwd.service
rm -f $RPM_BUILD_ROOT/%{_sysconfdir}/plugstack.conf.template
rm -f $RPM_BUILD_ROOT/%{_sysconfdir}/slurm.conf.template
rm -f $RPM_BUILD_ROOT/%{_sbindir}/capmc_suspend
rm -f $RPM_BUILD_ROOT/%{_sbindir}/capmc_resume
rm -f $RPM_BUILD_ROOT/%{_sbindir}/slurmconfgen.py
rm -f %{buildroot}/%{_sbindir}/slurmsmwd
%endif
install -D -m644 etc/cgroup.conf.example ${RPM_BUILD_ROOT}%{_sysconfdir}/cgroup.conf.example
......@@ -968,6 +984,13 @@ rm -rf $RPM_BUILD_ROOT
%endif
#############################################################################
%if %{with cray}
%files slurmsmwd
%{_sbindir}/slurmsmwd
%{_unitdir}/slurmsmwd.service
%endif
#############################################################################
%pre
#if [ -x /etc/init.d/slurm ]; then
# if /etc/init.d/slurm status | grep -q running; then
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment