rpm/slurm
SHA256
1
0
Fork 0
forked from pool/slurm
Code Pull Requests Activity

- Move wrapper script mpiexec provided by slrum-torque to

Browse Source 
mpiexec.slurm to avoid conflicts. This file is normally
  provided by the MPI implementation (boo#1041706).

OBS-URL: https://build.opensuse.org/package/show/network:cluster/slurm?expand=0&rev=19
This commit is contained in:
Egbert Eich 2017-05-30 10:41:04 +00:00 committed by Git OBS Bridge
parent 8b5c455f6f
commit a09041a8b6
2 changed files with 24 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
slurm.changes
View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Tue May 30 10:24:09 UTC 2017 - eich@suse.com
- Move wrapper script mpiexec provided by slrum-torque to
mpiexec.slurm to avoid conflicts. This file is normally
provided by the MPI implementation (boo#1041706).
-------------------------------------------------------------------
Mon May 8 10:10:04 UTC 2017 - eich@suse.com

13
slurm.spec
View File

@ -1,7 +1,7 @@
#
# spec file for package slurm
#
# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany.
# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -15,6 +15,7 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
# For anything newer than Leap 42.1 and SLE-12-SP1 build compatible to OpenHPC.
%if 0%{?sle_version} >= 120200
%define OHPC_BUILD 1
@ -168,8 +169,8 @@ This package cobtains the SLURM NULL authentication module.
%package munge
Summary: SLURM authentication and crypto implementation using Munge
Group: Productivity/Clustering/Computing
Requires: slurm = %{version}
Requires: munge
Requires: slurm = %{version}
BuildRequires: munge-devel
Obsoletes: slurm-auth-munge < %{version}
Provides: slurm-auth-munge = %{version}
@ -315,7 +316,6 @@ make install-contrib DESTDIR=%{buildroot} PERL_MM_PARAMS="INSTALLDIRS=vendor"
rm -f %{buildroot}/%{_sysconfdir}/slurm.conf.template
rm -f %{buildroot}/%{_sbindir}/slurmconfgen.py
%if 0%{?with_systemd}
mkdir -p %{buildroot}%{_unitdir}
install -p -m644 etc/slurmd.service etc/slurmdbd.service etc/slurmctld.service %{buildroot}%{_unitdir}
@ -397,6 +397,9 @@ rm -f %{buildroot}/%{_mandir}/man1/sjstat.1
sed -i 's/\r$//' %{buildroot}/%{_bindir}/qrerun
sed -i 's/\r$//' %{buildroot}/%{_bindir}/qalter
# avoid conflicts with other packages, make wrapper unique
mv %{buildroot}/%{_bindir}/mpiexec %{buildroot}/%{_bindir}/mpiexec.slurm
mkdir -p %{buildroot}/etc/ld.so.conf.d
echo '%{_libdir}
%{_libdir}/slurm' > %{buildroot}/etc/ld.so.conf.d/slurm.conf
@ -415,7 +418,6 @@ Name: %{name}
Version: %{version}
EOF
%fdupes -s %{buildroot}
%pre
@ -766,7 +768,7 @@ exit 0
%{_bindir}/qrerun
%{_bindir}/qstat
%{_bindir}/qsub
%{_bindir}/mpiexec
%{_bindir}/mpiexec.slurm
%files slurmdb-direct
%defattr(-,root,root)
@ -782,5 +784,4 @@ exit 0
/%_lib/security/pam_slurm.so
/%_lib/security/pam_slurm_adopt.so
%changelog