The package rpms/slurm.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/slurm.git/commit/?id=8f4e4663ab70....
Change:
-ExcludeArch: i686
Thanks.
Full change:
============
commit 8f4e4663ab70a8382aa06201e518373c2ca44d46
Author: Philip Kovacs <pkdevel(a)yahoo.com>
Date: Fri Jul 5 10:40:05 2019 -0400
fix bad merge
diff --git a/slurm.conf b/slurm.conf
index 06539c9..e84d7a7 100644
--- a/slurm.conf
+++ b/slurm.conf
@@ -31,7 +31,7 @@ CryptoType=crypto/munge
#MaxJobCount=5000
#MaxStepCount=40000
#MaxTasksPerNode=128
-MpiDefault=pmix
+MpiDefault=none
#MpiParams=ports=#-#
#PluginDir=
#PlugStackConfig=
diff --git a/slurm.spec b/slurm.spec
index af321c4..52d6717 100644
--- a/slurm.spec
+++ b/slurm.spec
@@ -11,8 +11,8 @@
%undefine _strict_symbol_defs_build
Name: slurm
-Version: 19.05.0
-Release: 5%{?dist}
+Version: 18.08.7
+Release: 3%{?dist}
Summary: Simple Linux Utility for Resource Management
License: GPLv2 and BSD
URL:
https://slurm.schedmd.com/
@@ -25,8 +25,6 @@ Source5: slurm-setuser.in
# Upstream bug #4449: release-style versioning of libslurmfull
Patch0: slurm_libslurmfull_version.patch
-# Upstream bug #7197: fix 19.05.0 testsuite
-Patch1: slurm_fix_testsuite.patch
# Build-related patches
Patch10: slurm_perlapi_rpaths.patch
@@ -46,7 +44,6 @@ BuildRequires: gcc
BuildRequires: perl-devel
BuildRequires: perl-ExtUtils-MakeMaker
BuildRequires: perl-interpreter
-BuildRequires: perl-macros
BuildRequires: perl-podlators
BuildRequires: pkgconf
BuildRequires: pkgconfig(check)
@@ -66,6 +63,7 @@ BuildRequires: pkgconfig(lua)
BuildRequires: pkgconfig(mariadb)
BuildRequires: pkgconfig(munge)
BuildRequires: pkgconfig(ncurses)
+BuildRequires: pkgconfig(openssl)
BuildRequires: pkgconfig(pmix) >= 2.0.0
BuildRequires: pkgconfig(zlib)
BuildRequires: readline-devel
@@ -76,10 +74,6 @@ BuildRequires: rdma-core-devel
BuildRequires: numactl-devel
%endif
-# exclude upstream-deprecated 32-bit architectures
-ExcludeArch: armv7hl
-ExcludeArch: i686
-
Requires: munge
Requires: pmix >= 2.0.0
%{?systemd_requires}
@@ -160,15 +154,6 @@ Slurm contribution package which includes the programs seff,
sjobexitmod, sjstat and smail. See their respective man pages
for more information.
-%package nss_slurm
-Summary: NSS plugin for slurm
-Requires: %{name}-libs%{?_isa} = %{version}-%{release}
-%description nss_slurm
-nss_slurm is an optional NSS plugin that can permit passwd and group resolution
-for a job on the compute node to be serviced through the local slurmstepd
-process, rather than through some alternate network-based service such as LDAP,
-SSSD, or NSLCD.
-
%package openlava
Summary: Openlava/LSF wrappers for transition from OpenLava/LSF to Slurm
Requires: %{name}-perlapi%{?_isa} = %{version}-%{release}
@@ -202,7 +187,6 @@ Torque wrapper scripts used for helping migrate from Torque/PBS to
Slurm.
%prep
%setup -q -n %{name_version}
%patch0 -p1
-%patch1 -p1
%patch10 -p1
%patch11 -p1
%patch12 -p1
@@ -362,7 +346,7 @@ done
# contribs docs
install -d -m 0755 %{buildroot}%{_docdir}/%{name}/contribs/lua
install -m 0644 contribs/README %{buildroot}%{_docdir}/%{name}/contribs
-install -m 0644 contribs/lua/*.lua %{buildroot}%{_docdir}/%{name}/contribs/lua
+install -m 0644 contribs/lua/proctrack.lua %{buildroot}%{_docdir}/%{name}/contribs/lua
# remove libtool archives
find %{buildroot} -name \*.a -o -name \*.la | xargs rm -f
@@ -378,7 +362,18 @@ rm -f %{buildroot}%{_libdir}/%{name}/auth_none.so
rm -f %{buildroot}%{_libdir}/%{name}/job_submit_defaults.so
rm -f %{buildroot}%{_libdir}/%{name}/job_submit_logging.so
rm -f %{buildroot}%{_libdir}/%{name}/job_submit_partition.so
+# remove bluegene files
+rm -f %{buildroot}%{_libdir}/%{name}/select_bluegene.so
+rm -f %{buildroot}%{_mandir}/man5/bluegene*
# remove cray files
+rm -f %{buildroot}%{_libdir}/%{name}/acct_gather_energy_cray.so
+rm -f %{buildroot}%{_libdir}/%{name}/core_spec_cray.so
+rm -f %{buildroot}%{_libdir}/%{name}/job_container_cncu.so
+rm -f %{buildroot}%{_libdir}/%{name}/job_submit_cray.so
+rm -f %{buildroot}%{_libdir}/%{name}/select_alps.so
+rm -f %{buildroot}%{_libdir}/%{name}/select_cray.so
+rm -f %{buildroot}%{_libdir}/%{name}/switch_cray.so
+rm -f %{buildroot}%{_libdir}/%{name}/task_cray.so
rm -f %{buildroot}%{_mandir}/man5/cray*
# remove perl cruft
rm -f %{buildroot}%{perl_vendorarch}/auto/Slurm*/.packlist
@@ -417,12 +412,11 @@ rm -f %{buildroot}%{perl_archlib}/perllocal.pod
%{_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}/core_spec_none.so
-%{_libdir}/%{name}/cred_{munge,none}.so
+%{_libdir}/%{name}/crypto_munge.so
+%{_libdir}/%{name}/crypto_openssl.so
%{_libdir}/%{name}/ext_sensors_none.so
-%{_libdir}/%{name}/gres_{gpu,mic,mps,nic}.so
-%{_libdir}/%{name}/gpu_generic.so
+%{_libdir}/%{name}/gres_{gpu,mic,nic}.so
%{_libdir}/%{name}/job_container_none.so
%{_libdir}/%{name}/job_submit_all_partitions.so
%{_libdir}/%{name}/job_submit_lua.so
@@ -442,8 +436,7 @@ rm -f %{buildroot}%{perl_archlib}/perllocal.pod
%{_libdir}/%{name}/proctrack_{cgroup,linuxproc,lua,pgid}.so
%{_libdir}/%{name}/route_{default,topology}.so
%{_libdir}/%{name}/sched_{backfill,builtin,hold}.so
-%{_libdir}/%{name}/select_{cons_res,cons_tres,linear,serial}.so
-%{_libdir}/%{name}/site_factor_none.so
+%{_libdir}/%{name}/select_{cons_res,linear,serial}.so
%{_libdir}/%{name}/slurmctld_nonstop.so
%{_libdir}/%{name}/switch_{generic,none}.so
%{_libdir}/%{name}/task_{affinity,cgroup,none}.so
@@ -515,6 +508,7 @@ rm -f %{buildroot}%{perl_archlib}/perllocal.pod
%files libs
%{_libdir}/libslurm.so.*
+%{_libdir}/libslurmdb.so.*
%{_libdir}/libslurmfull-*.so
# -------------
@@ -569,7 +563,7 @@ rm -f %{buildroot}%{perl_archlib}/perllocal.pod
%dir %{_docdir}/%{name}/contribs
%dir %{_docdir}/%{name}/contribs/lua
%{_docdir}/%{name}/contribs/README
-%{_docdir}/%{name}/contribs/lua/*.lua
+%{_docdir}/%{name}/contribs/lua/proctrack.lua
%{_bindir}/seff
%{_bindir}/sgather
%{_bindir}/sjobexitmod
@@ -579,13 +573,6 @@ rm -f %{buildroot}%{perl_archlib}/perllocal.pod
%{_mandir}/man1/sjobexitmod.1*
%{_mandir}/man1/sjstat.1*
-# ---------------
-# Slurm-nss_slurm
-# ---------------
-
-%files nss_slurm
-%{_libdir}/libnss_slurm.so.2
-
# --------------
# Slurm-openlava
# --------------
@@ -679,32 +666,17 @@ rm -f %{buildroot}%{perl_archlib}/perllocal.pod
%systemd_postun_with_restart slurmdbd.service
%changelog
-* Tue Jul 2 2019 Philip Kovacs <pkdevel(a)yahoo.com> - 19.05.0-5
+* Tue Jul 2 2019 Philip Kovacs <pkdevel(a)yahoo.com> - 18.08.7-3
- Do not install slurm implementation of libpmi/pmi2 libraries
- in favor of the faster implementation provided by pmix
- Remove pmi environment module formerly used to select the slurm
- vs pmix implementations of libpmi/pmi2
-* Wed Jun 19 2019 Philip Kovacs <pkdevel(a)yahoo.com> - 19.05.0-4
+* Wed Jun 19 2019 Philip Kovacs <pkdevel(a)yahoo.com> - 18.08.7-2
- Correct the configure for pmix
- Correct the slurm_pmix_soname patch
-
-* Wed Jun 19 2019 Philip Kovacs <pkdevel(a)yahoo.com> - 19.05.0-3
-- Stop using autotools macros that were removed from rpm
-
-* Sun Jun 9 2019 Philip Kovacs <pkdevel(a)yahoo.com> - 19.05.0-2
-- Exclude upstream-deprecated 32-bit architectures
-
-* Sun Jun 9 2019 Philip Kovacs <pkdevel(a)yahoo.com> - 19.05.0-1
-- Release of 19.05.0
-- Added nss_plugin subpackage for optional nss plugin
-- Added patch to fix 19.05.0 testsuite
-- Adjusted cray patch to remove all cray, cray_aries plugins
-- Reflect all upstream plugin additions/deletions
-- Remove openssl build dependency
-
-* Thu May 30 2019 Jitka Plesnikova <jplesnik(a)redhat.com> - 18.08.7-2
-- Perl 5.30 rebuild
+- Use make_build macro instead of make
+- Use autotools commands instead of rpm macros
* Fri Apr 12 2019 Philip Kovacs <pkdevel(a)yahoo.com> - 18.08.7-1
- Release of 18.08.7
diff --git a/slurm_do_not_build_cray.patch b/slurm_do_not_build_cray.patch
index 8b994dc..7ec7ecc 100644
--- a/slurm_do_not_build_cray.patch
+++ b/slurm_do_not_build_cray.patch
@@ -1,101 +1,10 @@
diff --git a/contribs/Makefile.am b/contribs/Makefile.am
-index da96aa070d..2a2d1f2c82 100644
+index 24ab9de7cc..087262c347 100644
--- a/contribs/Makefile.am
+++ b/contribs/Makefile.am
@@ -1,4 +1,4 @@
--SUBDIRS = cray lua mic nss_slurm openlava pam pam_slurm_adopt perlapi pmi pmi2 seff
sgather sgi sjobexit torque
-+SUBDIRS = lua mic nss_slurm openlava pam pam_slurm_adopt perlapi pmi pmi2 seff sgather
sgi sjobexit torque
+-SUBDIRS = cray lua mic openlava pam pam_slurm_adopt perlapi pmi pmi2 seff sgather sgi
sjobexit torque
++SUBDIRS = lua mic openlava pam pam_slurm_adopt perlapi pmi pmi2 seff sgather sgi
sjobexit torque
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
---- a/src/plugins/acct_gather_energy/Makefile.am
-+++ b/src/plugins/acct_gather_energy/Makefile.am
-@@ -1,3 +1,3 @@
- # Makefile for accounting gather energy plugins
-
--SUBDIRS = cray_aries rapl ibmaem ipmi none xcc
-+SUBDIRS = rapl ibmaem ipmi none xcc
-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
-+++ b/src/plugins/core_spec/Makefile.am
-@@ -1,3 +1,3 @@
- # Makefile for core specialization plugins
-
--SUBDIRS = cray_aries none
-+SUBDIRS = none
-diff --git a/src/plugins/job_container/Makefile.am
b/src/plugins/job_container/Makefile.am
-index 8e1960a456..529a9d581d 100644
---- a/src/plugins/job_container/Makefile.am
-+++ b/src/plugins/job_container/Makefile.am
-@@ -1,3 +1,3 @@
- # Makefile for job_container plugins
-
--SUBDIRS = cncu none
-+SUBDIRS = none
-diff --git a/src/plugins/job_submit/Makefile.am b/src/plugins/job_submit/Makefile.am
-index e393bcfb1c..b98cf2e000 100644
---- a/src/plugins/job_submit/Makefile.am
-+++ b/src/plugins/job_submit/Makefile.am
-@@ -2,7 +2,6 @@
-
- SUBDIRS = \
- all_partitions \
-- cray_aries \
- defaults \
- logging \
- lua \
-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
-+++ b/src/plugins/node_features/Makefile.am
-@@ -1,3 +1,3 @@
- # Makefile for node_features plugins
-
--SUBDIRS = knl_cray knl_generic
-+SUBDIRS = knl_generic
-diff --git a/src/plugins/power/Makefile.am b/src/plugins/power/Makefile.am
-index ccde44c322..c6171740c1 100644
---- a/src/plugins/power/Makefile.am
-+++ b/src/plugins/power/Makefile.am
-@@ -1,3 +1,3 @@
- # Makefile for power management plugins
-
--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
---- 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
-
- # 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
-index ddfe019a65..39a2b3eb7f 100644
---- a/src/plugins/switch/Makefile.am
-+++ b/src/plugins/switch/Makefile.am
-@@ -1,3 +1,3 @@
- # Makefile for switch plugins
-
--SUBDIRS = cray_aries generic none
-+SUBDIRS = generic none
-diff --git a/src/plugins/task/Makefile.am b/src/plugins/task/Makefile.am
-index 8d2a36eb68..607af1cb7c 100644
---- a/src/plugins/task/Makefile.am
-+++ b/src/plugins/task/Makefile.am
-@@ -1,6 +1,6 @@
- # Makefile for task plugins
-
--SUBDIRS = cray_aries none
-+SUBDIRS = none
-
- if HAVE_SCHED_SETAFFINITY
- SUBDIRS += affinity
+ gcp \
diff --git a/slurm_to_python3.patch b/slurm_to_python3.patch
index c60e941..fdfcbe8 100644
--- a/slurm_to_python3.patch
+++ b/slurm_to_python3.patch
@@ -38,6 +38,16 @@ index 54909096b9..93433d6fa3 100755
import re
import sys
+diff --git a/testsuite/expect/driveregress.py b/testsuite/expect/driveregress.py
+index 8019615953..4e7eb7ca0f 100755
+--- a/testsuite/expect/driveregress.py
++++ b/testsuite/expect/driveregress.py
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/env python3
+
+ ############################################################################
+ # Copyright (C) 2011-2013 SchedMD LLC
diff --git a/testsuite/expect/regression.py b/testsuite/expect/regression.py
index 938aecc154..ea64c7cce0 100755
--- a/testsuite/expect/regression.py