diff --git a/slurm.spec b/slurm.spec index b70f943..91feb9b 100644 --- a/slurm.spec +++ b/slurm.spec @@ -15,7 +15,7 @@ %endif Name: slurm -Version: 19.05.6 +Version: 20.02.2 Release: 1%{?dist} Summary: Simple Linux Utility for Resource Management License: GPLv2 and BSD @@ -64,7 +64,6 @@ BuildRequires: libssh2-devel BuildRequires: lz4-devel BuildRequires: mariadb-devel BuildRequires: munge-devel -BuildRequires: ncurses-devel BuildRequires: numactl-devel BuildRequires: pam-devel BuildRequires: pmix-devel @@ -115,8 +114,8 @@ html-based configuration tools for Slurm. Summary: Slurm gui and visual tools Requires: %{name}%{?_isa} = %{version}-%{release} %description gui -This package contains the Slurm visual tools smap and sview -and their respective man pages. +This package contains the Slurm visual tool sview and +its respective man pages. %package libs Summary: Slurm shared libraries @@ -415,8 +414,7 @@ rm -f %{buildroot}%{perl_archlib}/perllocal.pod %{_libdir}/%{name}/acct_gather_profile_{hdf5,influxdb,none}.so %{_libdir}/%{name}/auth_munge.so %{_libdir}/%{name}/burst_buffer_generic.so -%{_libdir}/%{name}/checkpoint_{none,ompi}.so -%{_libdir}/%{name}/cli_filter_none.so +%{_libdir}/%{name}/cli_filter_{lua,none,syslog,user_defaults}.so %{_libdir}/%{name}/core_spec_none.so %{_libdir}/%{name}/cred_{munge,none}.so %{_libdir}/%{name}/ext_sensors_none.so @@ -428,7 +426,7 @@ rm -f %{buildroot}%{perl_archlib}/perllocal.pod %{_libdir}/%{name}/job_submit_require_timelimit.so %{_libdir}/%{name}/job_submit_throttle.so %{_libdir}/%{name}/jobacct_gather_{cgroup,linux,none}.so -%{_libdir}/%{name}/jobcomp_{elasticsearch,filetxt,mysql,none,script}.so +%{_libdir}/%{name}/jobcomp_{elasticsearch,filetxt,lua,mysql,none,script}.so %{_libdir}/%{name}/launch_slurm.so %{_libdir}/%{name}/layouts_power_{cpufreq,default}.so %{_libdir}/%{name}/layouts_unit_default.so @@ -437,6 +435,7 @@ rm -f %{buildroot}%{perl_archlib}/perllocal.pod %{_libdir}/%{name}/node_features_knl_generic.so %{_libdir}/%{name}/power_none.so %{_libdir}/%{name}/preempt_{job_prio,none,partition_prio,qos}.so +%{_libdir}/%{name}/prep_script.so %{_libdir}/%{name}/priority_{basic,multifactor}.so %{_libdir}/%{name}/proctrack_{cgroup,linuxproc,lua,pgid}.so %{_libdir}/%{name}/route_{default,topology}.so @@ -460,6 +459,7 @@ rm -f %{buildroot}%{perl_archlib}/perllocal.pod %{_mandir}/man5/nonstop.conf.5* %{_mandir}/man5/slurm.conf.5* %{_mandir}/man5/topology.conf.5* +%{_mandir}/man8/slurmrestd.8* %{_mandir}/man8/spank.8* %{_sysconfdir}/logrotate.d/%{name} %{_sysconfdir}/%{name}/cgroup*.conf.example @@ -500,11 +500,9 @@ rm -f %{buildroot}%{perl_archlib}/perllocal.pod # --------- %files gui -%{_bindir}/smap %{_bindir}/sview %{_datadir}/applications/*.desktop %{_datadir}/icons/hicolor/*/apps/%{name}.png -%{_mandir}/man1/smap.1* %{_mandir}/man1/sview.1* # ---------- @@ -694,6 +692,9 @@ rm -f %{buildroot}%{perl_archlib}/perllocal.pod %systemd_postun_with_restart slurmdbd.service %changelog +* Tue May 5 2020 Philip Kovacs - 20.02.2-1 +- Release of 20.02.2 + * Mon Mar 30 2020 Philip Kovacs - 19.05.6-1 - Release of 19.05.6 diff --git a/slurm_to_python3.patch b/slurm_to_python3.patch index c60e941..e97c1b9 100644 --- a/slurm_to_python3.patch +++ b/slurm_to_python3.patch @@ -18,33 +18,3 @@ index b92aabc731..970c5b4802 100644 # # (c) Copyright 2013 Cray Inc. All Rights Reserved. # -diff --git a/doc/html/shtml2html.py b/doc/html/shtml2html.py -index 0b03182b80..43954a37a9 100755 ---- a/doc/html/shtml2html.py -+++ b/doc/html/shtml2html.py -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/env python3 - - import re - import sys -diff --git a/doc/man/man2html.py b/doc/man/man2html.py -index 54909096b9..93433d6fa3 100755 ---- a/doc/man/man2html.py -+++ b/doc/man/man2html.py -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/env python3 - - import re - import sys -diff --git a/testsuite/expect/regression.py b/testsuite/expect/regression.py -index 938aecc154..ea64c7cce0 100755 ---- a/testsuite/expect/regression.py -+++ b/testsuite/expect/regression.py -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/env python3 - ############################################################################ - # Copyright (C) 2006 The Regents of the University of California. - # Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER). diff --git a/slurm_without_cray.patch b/slurm_without_cray.patch index ce4aa86..5ffdc65 100644 --- a/slurm_without_cray.patch +++ b/slurm_without_cray.patch @@ -9,14 +9,17 @@ index da96aa070d..2a2d1f2c82 100644 EXTRA_DIST = \ make-3.81.slurm.patch \ diff --git a/src/plugins/acct_gather_energy/Makefile.am b/src/plugins/acct_gather_energy/Makefile.am -index 50c4fd36a2..c826387219 100644 +index 937808035f..2abce6efdc 100644 --- a/src/plugins/acct_gather_energy/Makefile.am +++ b/src/plugins/acct_gather_energy/Makefile.am -@@ -1,3 +1,3 @@ +@@ -1,6 +1,6 @@ # Makefile for accounting gather energy plugins -SUBDIRS = cray_aries rapl ibmaem ipmi none xcc +SUBDIRS = rapl ibmaem ipmi none xcc + + if BUILD_RSMI + SUBDIRS += rsmi diff --git a/src/plugins/core_spec/Makefile.am b/src/plugins/core_spec/Makefile.am index 44b1ed67c0..f06bc541d7 100644 --- a/src/plugins/core_spec/Makefile.am @@ -47,6 +50,18 @@ index e393bcfb1c..b98cf2e000 100644 defaults \ logging \ lua \ +diff --git a/src/plugins/mpi/Makefile.am b/src/plugins/mpi/Makefile.am +index 4d055e2030..1a44dfb2ab 100644 +--- a/src/plugins/mpi/Makefile.am ++++ b/src/plugins/mpi/Makefile.am +@@ -1,6 +1,6 @@ + # Makefile for mpi plugins + +-SUBDIRS = cray_shasta none pmi2 ++SUBDIRS = none pmi2 + if HAVE_PMIX + SUBDIRS += pmix + endif diff --git a/src/plugins/node_features/Makefile.am b/src/plugins/node_features/Makefile.am index f5ef036303..d955c51ba1 100644 --- a/src/plugins/node_features/Makefile.am @@ -66,16 +81,16 @@ index ccde44c322..c6171740c1 100644 -SUBDIRS = common cray_aries none +SUBDIRS = common none diff --git a/src/plugins/select/Makefile.am b/src/plugins/select/Makefile.am -index 09fdfd2313..570af23c4a 100644 +index 74606481ff..bebf728529 100644 --- a/src/plugins/select/Makefile.am +++ b/src/plugins/select/Makefile.am @@ -1,7 +1,7 @@ # Makefile for node selection plugins - + # NOTE: other must be in the list before cray_aries lest the build break --SUBDIRS = other cons_res cons_tres cray_aries linear -+SUBDIRS = other cons_res cons_tres linear - +-SUBDIRS = other cons_common cons_res cons_tres cray_aries linear ++SUBDIRS = other cons_common cons_res cons_tres linear + # Each plugin here needs a plugin_id, here are the currect plug_ids # for each plugin. diff --git a/src/plugins/switch/Makefile.am b/src/plugins/switch/Makefile.am diff --git a/sources b/sources index 0cfa84d..72b8439 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (slurm-19.05.6.tar.bz2) = 83ee22b763dd27f13fbb372449cd074df2177357812582473c28ecd4dac803365c8814b6f8a0928ac31325d1a0ba439b25c02a92d79132205244506a728fe583 +SHA512 (slurm-20.02.2.tar.bz2) = c7f08e795e1a0ec5803f96c49c53818709b2aac0ddc70540b96f9c0ee6c37d5260aaa4b47c1a369fa1a45f5e95b03c1f2fbca41ba1d82dc3a49453a415f2a4c4