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

Accepting request 815491 from network:cluster

Browse Source 
OBS-URL: https://build.opensuse.org/request/show/815491
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/slurm?expand=0&rev=46
This commit is contained in:
Dominique Leuenberger 2020-07-02 22:07:05 +00:00 committed by Git OBS Bridge
commit a8d157b928
3 changed files with 54 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
slurm-rpmlintrc
View File

@ -1,2 +1,13 @@
addFilter(".*obsolete-not-provided slurm-sched-wiki.*") addFilter(".*obsolete-not-provided slurm-sched-wiki.*")
addFilter(".*obsolete-not-provided slurmdb-direct.*") addFilter(".*obsolete-not-provided slurmdb-direct.*")
# libslurm provides an ABI and a wire protocol. The wire protocol may change
# with any SLURM version in an incompatible way. Therefore, multiple versions
# of libslurm should not be installed on the same system.
# Thus, libraries depending on libslurm need to match the installed SLURM
# version - independent of their major versions.
# To host multiple SLURM versions in the same repository we add the version
# string to package names for none-base versions - even to library packages.
# This mainly applies to upgrade packages for Leap and SLE in the maintenance
# channel.
addFilter("libnss_slurm\d_\d{2}_\d{2}.*: .* shlib-policy-name-error.*")

15
slurm.changes
View File

@ -1,3 +1,12 @@
-------------------------------------------------------------------
Wed Jun 3 11:11:11 UTC 2020 - Egbert Eich <eich@suse.com>
- Bring QA to the package build: add %%check stage.
- Remove cruft that isn't needed any longer.
- Add 'ghosted' run-file.
- Add rpmlint filter to handle issues with library packages
for Leap and enterprise upgrade versions.
------------------------------------------------------------------- -------------------------------------------------------------------
Fri May 22 08:45:46 UTC 2020 - Christian Goll <cgoll@suse.com> Fri May 22 08:45:46 UTC 2020 - Christian Goll <cgoll@suse.com>
@ -26,6 +35,12 @@ Fri May 22 08:45:46 UTC 2020 - Christian Goll <cgoll@suse.com>
* Fix step allocations when tasks_per_core > 1. * Fix step allocations when tasks_per_core > 1.
* Fix allocating more GRES than requested when asking for multiple GRES types. * Fix allocating more GRES than requested when asking for multiple GRES types.
-------------------------------------------------------------------
Wed May 6 10:54:43 UTC 2020 - Egbert Eich <eich@suse.com>
- Treat libnss_slurm like any other package: add version string to
upgrade package.
------------------------------------------------------------------- -------------------------------------------------------------------
Fri Mar 27 08:26:34 UTC 2020 - Christian Goll <cgoll@suse.com> Fri Mar 27 08:26:34 UTC 2020 - Christian Goll <cgoll@suse.com>

65
slurm.spec
View File

@ -180,6 +180,7 @@ BuildRequires: libssh2-devel
BuildRequires: rrdtool-devel BuildRequires: rrdtool-devel
%if 0%{?with_systemd} %if 0%{?with_systemd}
%{?systemd_ordering} %{?systemd_ordering}
BuildRequires: dejagnu
BuildRequires: pkgconfig(systemd) BuildRequires: pkgconfig(systemd)
%else %else
Requires(post): %insserv_prereq %fillup_prereq Requires(post): %insserv_prereq %fillup_prereq
@ -235,6 +236,8 @@ This package includes the Perl API to provide an interface to SLURM
through Perl. through Perl.
%package -n %{libslurm} %package -n %{libslurm}
# the .so number of libslurm is bumped with each major release
# therefore no need for a version string for Leap/SLE upgrade packages
Summary: Libraries for SLURM Summary: Libraries for SLURM
Group: System/Libraries Group: System/Libraries
Requires: %{name}-config = %{version} Requires: %{name}-config = %{version}
@ -256,12 +259,14 @@ Group: System/Libraries
This package contains the library needed to run programs dynamically linked This package contains the library needed to run programs dynamically linked
with SLURM. with SLURM.
%package -n libnss_%{pname}%{nss_so} %package -n libnss_%{pname}%{nss_so}%{?upgrade:%{_ver}}
Summary: NSS Plugin for SLURM Summary: NSS Plugin for SLURM
Group: System/Libraries Group: System/Libraries
%{?upgrade:Provides: libnss%{nss_so} = %{version}}
%{?upgrade:Conflicts: libnss%{nss_so}}
%description -n libnss_%{pname}%{nss_so} %description -n libnss_%{pname}%{nss_so}%{?upgrade:%{_ver}}
ibnss_slurm is an optional NSS plugin that permits password and group libnss_slurm is an optional NSS plugin that permits password and group
resolution for a job on a compute node to be serviced through the local resolution for a job on a compute node to be serviced through the local
slurmstepd process. slurmstepd process.
@ -581,13 +586,6 @@ ln -sf %{_initrddir}/slurmdbd %{buildroot}%{_sbindir}/rcslurmdbd
%endif %endif
mkdir -p %{buildroot}%{_localstatedir}/spool/slurm mkdir -p %{buildroot}%{_localstatedir}/spool/slurm
rm -f contribs/cray/opt_modulefiles_slurm
rm -f %{buildroot}%{_sysconfdir}/plugstack.conf.template
rm -f %{buildroot}%{_sysconfdir}/slurm.conf.template
rm -f %{buildroot}%{_sbindir}/capmc_suspend
rm -f %{buildroot}%{_sbindir}/capmc_resume
rm -f %{buildroot}%{_sbindir}/slurmconfgen.py
install -D -m644 etc/cgroup.conf.example %{buildroot}/%{_sysconfdir}/%{pname}/cgroup.conf install -D -m644 etc/cgroup.conf.example %{buildroot}/%{_sysconfdir}/%{pname}/cgroup.conf
install -D -m644 etc/layouts.d.power.conf.example %{buildroot}/%{_sysconfdir}/%{pname}/layouts.d/power.conf.example install -D -m644 etc/layouts.d.power.conf.example %{buildroot}/%{_sysconfdir}/%{pname}/layouts.d/power.conf.example
install -D -m644 etc/layouts.d.power_cpufreq.conf.example %{buildroot}/%{_sysconfdir}/%{pname}/layouts.d/power_cpufreq.conf.example install -D -m644 etc/layouts.d.power_cpufreq.conf.example %{buildroot}/%{_sysconfdir}/%{pname}/layouts.d/power_cpufreq.conf.example
@ -635,47 +633,35 @@ sed -i -e "s@PIDFile=.*@PIDFile=%{_localstatedir}/run/slurm/slurmdbd.pid@" \
%{buildroot}/%{_unitdir}/slurmdbd.service %{buildroot}/%{_unitdir}/slurmdbd.service
%endif %endif
# Delete unpackaged files: # Delete static files:
test -s %{buildroot}/%{_perldir}/auto/Slurm/Slurm.bs ||
rm -f %{buildroot}/%{_perldir}/auto/Slurm/Slurm.bs
test -s %{buildroot}/%{_perldir}/auto/Slurmdb/Slurmdb.bs ||
rm -f %{buildroot}/%{_perldir}/auto/Slurmdb/Slurmdb.bs
rm -rf %{buildroot}/%{_libdir}/slurm/*.{a,la} \ rm -rf %{buildroot}/%{_libdir}/slurm/*.{a,la} \
%{buildroot}/%{_libdir}/*.la \ %{buildroot}/%{_libdir}/*.la \
%{buildroot}/%_lib/security/*.la \ %{buildroot}/%_lib/security/*.la
%{buildroot}/%{_mandir}/man5/bluegene*
rm -f %{buildroot}/%{_mandir}/man1/srun_cr* \ rm %{buildroot}/%{perl_archlib}/perllocal.pod \
%{buildroot}/%{_bindir}/srun_cr \ %{buildroot}/%{perl_vendorarch}/auto/Slurm/.packlist \
%{buildroot}/%{_libexecdir}/slurm/cr_* %{buildroot}/%{perl_vendorarch}/auto/Slurmdb/.packlist
rm doc/html/shtml2html.py doc/html/Makefile* # Remove Cray specific binaries
rm -f %{buildroot}/%{_sbindir}/capmc_suspend \
rm -f %{buildroot}/%{perl_archlib}/perllocal.pod %{buildroot}/%{_sbindir}/capmc_resume
rm -f %{buildroot}/%{perl_vendorarch}/auto/Slurm/.packlist
rm -f %{buildroot}/%{perl_vendorarch}/auto/Slurmdb/.packlist
# Build man pages that are generated directly by the tools # Build man pages that are generated directly by the tools
rm -f %{buildroot}/%{_mandir}/man1/sjobexitmod.1
%{buildroot}%{_bindir}/sjobexitmod --roff > %{buildroot}/%{_mandir}/man1/sjobexitmod.1 %{buildroot}%{_bindir}/sjobexitmod --roff > %{buildroot}/%{_mandir}/man1/sjobexitmod.1
rm -f %{buildroot}/%{_mandir}/man1/sjstat.1
%{buildroot}%{_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 # rpmlint reports wrong end of line for those files
sed -i 's/\r$//' %{buildroot}/%{_bindir}/qrerun #sed -i 's/\r$//' %{buildroot}/%{_bindir}/qrerun
sed -i 's/\r$//' %{buildroot}/%{_bindir}/qalter #sed -i 's/\r$//' %{buildroot}/%{_bindir}/qalter
# avoid conflicts with other packages, make wrapper unique # avoid conflicts with other packages, make wrapper unique
mv %{buildroot}/%{_bindir}/mpiexec %{buildroot}/%{_bindir}/mpiexec.slurm mv %{buildroot}/%{_bindir}/mpiexec %{buildroot}/%{_bindir}/mpiexec.slurm
mkdir -p %{buildroot}/etc/ld.so.conf.d mkdir -p %{buildroot}/etc/ld.so.conf.d
echo '%{_libdir} echo '%{_libdir}/slurm' > %{buildroot}/etc/ld.so.conf.d/slurm.conf
%{_libdir}/slurm' > %{buildroot}/etc/ld.so.conf.d/slurm.conf
chmod 644 %{buildroot}/etc/ld.so.conf.d/slurm.conf chmod 644 %{buildroot}/etc/ld.so.conf.d/slurm.conf
# Make pkg-config file # Make pkg-config file
mkdir -p %{buildroot}/%{_libdir}/pkgconfig mkdir -p %{buildroot}/%{_libdir}/pkgconfig
cat > %{buildroot}/%{_libdir}/pkgconfig/slurm.pc <<EOF cat > %{buildroot}/%{_libdir}/pkgconfig/slurm.pc <<EOF
includedir=%{_prefix}/include includedir=%{_prefix}/include
@ -737,6 +723,9 @@ EOF
rm -f %{buildroot}/%{_mandir}/man8/slurmrestd.* rm -f %{buildroot}/%{_mandir}/man8/slurmrestd.*
%endif %endif
%check
make check
%define fixperm() [ $1 -eq 1 -a -e %2 ] && /bin/chmod %1 %2 %define fixperm() [ $1 -eq 1 -a -e %2 ] && /bin/chmod %1 %2
%pre %pre
@ -842,8 +831,8 @@ exit 0
%post -n libpmi%{pmi_so}%{?upgrade:%{_ver}} -p /sbin/ldconfig %post -n libpmi%{pmi_so}%{?upgrade:%{_ver}} -p /sbin/ldconfig
%postun -n libpmi%{pmi_so}%{?upgrade:%{_ver}} -p /sbin/ldconfig %postun -n libpmi%{pmi_so}%{?upgrade:%{_ver}} -p /sbin/ldconfig
%post -n libnss_%{pname}%{nss_so} -p /sbin/ldconfig %post -n libnss_%{pname}%{nss_so}%{?upgrade:%{_ver}} -p /sbin/ldconfig
%postun -n libnss_%{pname}%{nss_so} -p /sbin/ldconfig %postun -n libnss_%{pname}%{nss_so}%{?upgrade:%{_ver}} -p /sbin/ldconfig
%{!?nil: %{!?nil:
# On update the %%postun code of the old package restarts the # On update the %%postun code of the old package restarts the
@ -984,7 +973,7 @@ exit 0
%{?comp_at} %{?comp_at}
%{_libdir}/libpmi*.so.%{pmi_so}* %{_libdir}/libpmi*.so.%{pmi_so}*
%files -n libnss_%{pname}%{nss_so} %files -n libnss_%{pname}%{nss_so}%{?upgrade:%{_ver}}
%{?comp_at} %{?comp_at}
%config(noreplace) %{_sysconfdir}/%{pname}/nss_slurm.conf %config(noreplace) %{_sysconfdir}/%{pname}/nss_slurm.conf
%{_libdir}/libnss_slurm.so.%{nss_so} %{_libdir}/libnss_slurm.so.%{nss_so}
@ -1209,6 +1198,7 @@ exit 0
%config(noreplace) %{_sysconfdir}/%{pname}/layouts.d/unit.conf.example %config(noreplace) %{_sysconfdir}/%{pname}/layouts.d/unit.conf.example
%attr(0755, %slurm_u, %slurm_g) %_localstatedir/lib/slurm %attr(0755, %slurm_u, %slurm_g) %_localstatedir/lib/slurm
%{?with_systemd:%{_tmpfilesdir}/%{pname}.conf} %{?with_systemd:%{_tmpfilesdir}/%{pname}.conf}
%{?_rundir:%ghost %{_rundir}/slurm}
%dir %attr(0755, %slurm_u, %slurm_g)%{_localstatedir}/spool/slurm %dir %attr(0755, %slurm_u, %slurm_g)%{_localstatedir}/spool/slurm
%config(noreplace) %{_sysconfdir}/logrotate.d/slurm* %config(noreplace) %{_sysconfdir}/logrotate.d/slurm*
@ -1234,6 +1224,7 @@ exit 0
%files cray %files cray
%{?comp_at} %{?comp_at}
# do not remove cray sepcific packages from SLES update # do not remove cray sepcific packages from SLES update
# Only for Cray
%{_libdir}/slurm/acct_gather_energy_cray_aries.so %{_libdir}/slurm/acct_gather_energy_cray_aries.so
%{_libdir}/slurm/core_spec_cray_aries.so %{_libdir}/slurm/core_spec_cray_aries.so
%{_libdir}/slurm/job_submit_cray_aries.so %{_libdir}/slurm/job_submit_cray_aries.so