forked from pool/slurm
- 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). OBS-URL: https://build.opensuse.org/package/show/network:cluster/slurm?expand=0&rev=19
This commit is contained in:
Git OBS Bridge
parent
8b5c455f6f
commit
a09041a8b6
@ -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
|
||||
|
||||
|
||||
33
slurm.spec
33
slurm.spec
@ -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
|
||||
@ -66,8 +67,8 @@ Source1: slurm.service
|
||||
Source2: slurmdbd.service
|
||||
Patch0: slurm-2.4.4-rpath.patch
|
||||
Patch1: slurm-2.4.4-init.patch
|
||||
Patch2: slurmd-Fix-slurmd-for-new-API-in-hwloc-2.0.patch
|
||||
Patch3: plugins-cgroup-Fix-slurmd-for-new-API-in-hwloc-2.0.patch
|
||||
Patch2: slurmd-Fix-slurmd-for-new-API-in-hwloc-2.0.patch
|
||||
Patch3: plugins-cgroup-Fix-slurmd-for-new-API-in-hwloc-2.0.patch
|
||||
Patch4: pam_slurm-Initialize-arrays-and-pass-sizes.patch
|
||||
Requires: slurm-plugins = %{version}
|
||||
%if 0%{?suse_version} <= 1140
|
||||
@ -106,7 +107,7 @@ BuildRequires: systemd
|
||||
PreReq: %insserv_prereq %fillup_prereq
|
||||
%endif
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||
Recommends: %{name}-munge
|
||||
Recommends: %{name}-munge
|
||||
|
||||
%description
|
||||
SLURM is an open source, fault-tolerant, and highly
|
||||
@ -116,8 +117,8 @@ status, partition management, job management, scheduling and
|
||||
accounting modules.
|
||||
|
||||
%package doc
|
||||
Summary: Documentation for SLURM
|
||||
Group: Documentation/HTML
|
||||
Summary: Documentation for SLURM
|
||||
Group: Documentation/HTML
|
||||
|
||||
%description doc
|
||||
Documentation (html) for the SLURM cluster managment software.
|
||||
@ -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}
|
||||
@ -226,17 +227,17 @@ Provides: torque-client
|
||||
Torque wrapper scripts used for helping migrate from Torque/PBS to SLURM.
|
||||
|
||||
%package openlava
|
||||
Summary: Openlava/LSF wrappers for transitition from OpenLava/LSF to Slurm
|
||||
Summary: Openlava/LSF wrappers for transitition from OpenLava/LSF to Slurm
|
||||
Group: Productivity/Clustering/Computing
|
||||
Requires: perl-slurm = %{version}
|
||||
Requires: perl-slurm = %{version}
|
||||
|
||||
%description openlava
|
||||
OpenLava wrapper scripts used for helping migrate from OpenLava/LSF to Slurm
|
||||
|
||||
%package seff
|
||||
Summary: Mail tool that includes job statistics in user notification email
|
||||
Summary: Mail tool that includes job statistics in user notification email
|
||||
Group: Productivity/Clustering/Computing
|
||||
Requires: perl-slurm = %{version}
|
||||
Requires: perl-slurm = %{version}
|
||||
|
||||
%description seff
|
||||
Mail program used directly by the Slurm daemons. On completion of a job,
|
||||
@ -284,7 +285,7 @@ to root, any user with an SLURM-launched job currently running on the node,
|
||||
or any user who has allocated resources on the node according to the SLURM
|
||||
|
||||
%package lua
|
||||
Summary: Lua API for SLURM
|
||||
Summary: Lua API for SLURM
|
||||
Group: Development/Languages/Other
|
||||
Requires: slurm = %{version}
|
||||
BuildRequires: lua-devel
|
||||
@ -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
|
||||
|
||||
Loading…
Reference in New Issue
Block a user