Hello community, here is the log from the commit of package slurm for openSUSE:Factory checked in at 2017-06-08 15:01:56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/slurm (Old) and /work/SRC/openSUSE:Factory/.slurm.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "slurm" Thu Jun 8 15:01:56 2017 rev:2 rq:499661 version:MACRO Changes: -------- --- /work/SRC/openSUSE:Factory/slurm/slurm.changes 2017-03-04 16:52:30.585844221 +0100 +++ /work/SRC/openSUSE:Factory/.slurm.new/slurm.changes 2017-06-08 15:01:57.363889607 +0200 @@ -1,0 +2,19 @@ +Tue May 30 10:24:09 UTC 2017 - [email protected] + +- 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 - [email protected] + +- Replace remaining ${RPM_BUILD_ROOT}s. +- Improve description. +- Fix up changelog. + +------------------------------------------------------------------- +Fri Mar 31 12:43:25 UTC 2017 - [email protected] +- Spec file: Replace "Requires : slurm-perlapi" by + "Requires: perl-slurm = %{version}" (boo#1031872). + +------------------------------------------------------------------- @@ -54,0 +74,2 @@ +- Fix array initialzation and ensure strings are always NULL terminated in +- pam_slurm.c (bsc#1007053). @@ -76,0 +98,5 @@ + +------------------------------------------------------------------- +Fri Dec 2 19:39:56 UTC 2016 - [email protected] + +- Create slurm user/group in preinstall script. ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ slurm.spec ++++++ --- /var/tmp/diff_new_pack.5Yg59x/_old 2017-06-08 15:01:58.251764300 +0200 +++ /var/tmp/diff_new_pack.5Yg59x/_new 2017-06-08 15:01:58.255763737 +0200 @@ -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 @@ -109,7 +110,8 @@ Recommends: %{name}-munge %description -SLURM is a cluster management and job scheduling system for Linux +SLURM is an open source, fault-tolerant, and highly +scalable cluster management and job scheduling system for Linux clusters containing up to 65,536 nodes. Components include machine status, partition management, job management, scheduling and accounting modules. @@ -119,7 +121,7 @@ Group: Documentation/HTML %description doc -Documentation for the SLURM cluster managment software. +Documentation (html) for the SLURM cluster managment software. %package -n perl-slurm Summary: Perl API to SLURM @@ -167,8 +169,8 @@ %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} @@ -227,7 +229,7 @@ %package openlava Summary: Openlava/LSF wrappers for transitition from OpenLava/LSF to Slurm Group: Productivity/Clustering/Computing -Requires: slurm-perlapi +Requires: perl-slurm = %{version} %description openlava OpenLava wrapper scripts used for helping migrate from OpenLava/LSF to Slurm @@ -235,7 +237,7 @@ %package seff Summary: Mail tool that includes job statistics in user notification email Group: Productivity/Clustering/Computing -Requires: slurm-perlapi +Requires: perl-slurm = %{version} %description seff Mail program used directly by the Slurm daemons. On completion of a job, @@ -310,10 +312,9 @@ %install %make_install -make install-contrib DESTDIR=$RPM_BUILD_ROOT PERL_MM_PARAMS="INSTALLDIRS=vendor" -rm -f $RPM_BUILD_ROOT/%{_sysconfdir}/slurm.conf.template -rm -f $RPM_BUILD_ROOT/%{_sbindir}/slurmconfgen.py - +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} @@ -322,8 +323,8 @@ ln -s /usr/sbin/service %{buildroot}%{_sbindir}/rcslurmdbd ln -s /usr/sbin/service %{buildroot}%{_sbindir}/rcslurmctld %else -install -D -m755 etc/init.d.slurm $RPM_BUILD_ROOT%{_initrddir}/slurm -install -D -m755 etc/init.d.slurmdbd $RPM_BUILD_ROOT%{_initrddir}/slurmdbd +install -D -m755 etc/init.d.slurm %{buildroot}%{_initrddir}/slurm +install -D -m755 etc/init.d.slurmdbd %{buildroot}%{_initrddir}/slurmdbd ln -sf %{_initrddir}/slurm %{buildroot}%{_sbindir}/rcslurm ln -sf %{_initrddir}/slurmdbd %{buildroot}%{_sbindir}/rcslurmdbd %endif @@ -336,15 +337,15 @@ install -D -m755 etc/cgroup.release_common.example %{buildroot}/%{_sysconfdir}/%{name}/cgroup/release_freezer install -D -m755 etc/cgroup.release_common.example %{buildroot}/%{_sysconfdir}/%{name}/cgroup/release_cpuset install -D -m755 etc/cgroup.release_common.example %{buildroot}/%{_sysconfdir}/%{name}/cgroup/release_memory -install -D -m644 etc/slurmdbd.conf.example ${RPM_BUILD_ROOT}%{_sysconfdir}/%{name}/slurmdbd.conf.example -install -D -m755 etc/slurm.epilog.clean ${RPM_BUILD_ROOT}%{_sysconfdir}/%{name}/slurm.epilog.clean -install -D -m755 contribs/sgather/sgather ${RPM_BUILD_ROOT}%{_bindir}/sgather -install -D -m755 contribs/sjstat ${RPM_BUILD_ROOT}%{_bindir}/sjstat +install -D -m644 etc/slurmdbd.conf.example %{buildroot}%{_sysconfdir}/%{name}/slurmdbd.conf.example +install -D -m755 etc/slurm.epilog.clean %{buildroot}%{_sysconfdir}/%{name}/slurm.epilog.clean +install -D -m755 contribs/sgather/sgather %{buildroot}%{_bindir}/sgather +install -D -m755 contribs/sjstat %{buildroot}%{_bindir}/sjstat %if 0%{?OHPC_BUILD} # 6/16/15 [email protected] - do not package Slurm's version of libpmi with OpenHPC. -## rm -f %{buildroot}/%%{_libdir}/libpmi* -## rm -f %{buildroot}/%%{_libdir}/mpi_pmi2* +## rm -f %%{buildroot}/%%{_libdir}/libpmi* +## rm -f %%{buildroot}/%%{_libdir}/mpi_pmi2* # 9/8/14 [email protected] - provide starting config file head -n -2 %{buildroot}/%{_sysconfdir}/%{name}/slurm.conf.example | grep -v ReturnToService > %{buildroot}/%{_sysconfdir}/%{name}/slurm.conf sed -i 's#\(StateSaveLocation=\).*#\1%_localstatedir/lib/slurm#' %{buildroot}/%{_sysconfdir}/%{name}/slurm.conf @@ -388,14 +389,17 @@ # Build man pages that are generated directly by the tools rm -f %{buildroot}/%{_mandir}/man1/sjobexitmod.1 -${RPM_BUILD_ROOT}%{_bindir}/sjobexitmod --roff > %{buildroot}/%{_mandir}/man1/sjobexitmod.1 +%{buildroot}%{_bindir}/sjobexitmod --roff > %{buildroot}/%{_mandir}/man1/sjobexitmod.1 rm -f %{buildroot}/%{_mandir}/man1/sjstat.1 -${RPM_BUILD_ROOT}%{_bindir}/sjstat --roff > %{buildroot}/%{_mandir}/man1/sjstat.1 +%{buildroot}%{_bindir}/sjstat --roff > %{buildroot}/%{_mandir}/man1/sjstat.1 # rpmlint reports wrong end of line for those files 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 @@ -414,7 +418,6 @@ Version: %{version} EOF - %fdupes -s %{buildroot} %pre @@ -765,7 +768,7 @@ %{_bindir}/qrerun %{_bindir}/qstat %{_bindir}/qsub -%{_bindir}/mpiexec +%{_bindir}/mpiexec.slurm %files slurmdb-direct %defattr(-,root,root) @@ -781,5 +784,4 @@ /%_lib/security/pam_slurm.so /%_lib/security/pam_slurm_adopt.so - %changelog
