Hello community,
here is the log from the commit of package slurm for openSUSE:Leap:15.2 checked
in at 2020-03-06 12:40:45
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Leap:15.2/slurm (Old)
and /work/SRC/openSUSE:Leap:15.2/.slurm.new.26092 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "slurm"
Fri Mar 6 12:40:45 2020 rev:61 rq:781752 version:20.02.0
Changes:
--------
--- /work/SRC/openSUSE:Leap:15.2/slurm/slurm.changes 2020-02-25
12:17:41.540495782 +0100
+++ /work/SRC/openSUSE:Leap:15.2/.slurm.new.26092/slurm.changes 2020-03-06
12:44:18.322867646 +0100
@@ -1,0 +2,55 @@
+Fri Feb 28 17:27:43 UTC 2020 - Egbert Eich <e...@suse.com>
+
+- Removed autopatch as it doesn't work for the SLE-11-SP4 build.
+
+-------------------------------------------------------------------
+Thu Feb 27 20:07:19 UTC 2020 - Kasimir _ <kasim...@outlook.de>
+
+- Disable %arm builds as this is no longer supported.
+
+-------------------------------------------------------------------
+Thu Feb 27 10:19:05 UTC 2020 - Christian Goll <cg...@suse.com>
+
+- pmix searches now also for libpmix.so.2 so that there is no dependency
+ for devel package (bsc#1164386)
+ * added patch file check-for-lipmix.so.MAJOR.patch
+ * reworded patch file Remove-rpath-from-build.patch to use %autopatch
+
+-------------------------------------------------------------------
+Wed Feb 26 06:13:13 UTC 2020 - Egbert Eich <e...@suse.com>
+
+- Update to version 20.02.0 (jsc#SLE-8491)
+ * Fix minor memory leak in slurmd on reconfig.
+ * Fix invalid ptr reference when rolling up data in the database.
+ * Change shtml2html.py to require python3 for RHEL8 support, and match
+ man2html.py.
+ * slurm.spec - override "hardening" linker flags to ensure RHEL8 builds
+ in a usable manner.
+ * Fix type mismatches in the perl API.
+ * Prevent use of uninitialized slurmctld_diag_stats.
+ * Fixed various Coverity issues.
+ * Only show warning about root-less topology in daemons.
+ * Fix accounting of jobs in IGNORE_JOBS reservations.
+ * Fix issue with batch steps state not loading correctly when upgrading from
+ 19.05.
+ * Deprecate max_depend_depth in SchedulerParameters and move it to
+ DependencyParameters.
+ * Silence erroneous error on slurmctld upgrade when loading federation state.
+ * Break infinite loop in cons_tres dealing with incorrect tasks per tres
+ request resulting in slurmctld hang.
+ * Improve handling of --gpus-per-task to make sure appropriate number of GPUs
+ is assigned to job.
+ * Fix seg fault on cons_res when requesting --spread-job.
+- Move to python3 for everything but SLE-11-SP4
+ * For SLE-11-SP4 add a workaround to handle a python3 script (python2.7
+ compliant).
+
+-------------------------------------------------------------------
+Wed Feb 19 21:27:00 UTC 2020 - Egbert Eich <e...@suse.com>
+
+- Add explicit version dependency to libpmix as well.
+ 'slurm-devel' has a tight version dependency on libpmix -
+ allowing multiple libpmix versions in one package repository
+ is therefore essential.
+
+-------------------------------------------------------------------
Old:
----
slurm-20.02.0-0rc1.tar.bz2
New:
----
check-for-lipmix.so.MAJOR.patch
slurm-20.02.0.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ slurm.spec ++++++
--- /var/tmp/diff_new_pack.hjxYkb/_old 2020-03-06 12:44:18.874867981 +0100
+++ /var/tmp/diff_new_pack.hjxYkb/_new 2020-03-06 12:44:18.878867983 +0100
@@ -20,14 +20,15 @@
%define so_version 35
%define ver 20.02.0
%define _ver _20_02
-%define dl_ver %{ver}-0rc1
+%define dl_ver %{ver}
# so-version is 0 and seems to be stable
%define pmi_so 0
%define nss_so 2
+%define pmix_so 2
%define pname slurm
-%ifarch i586
+%ifarch i586 %arm
ExclusiveArch: do_not_build
%endif
@@ -64,8 +65,10 @@
%if 0%{?suse_version:1} && 0%{?suse_version} <= 1140
%define comp_at %defattr(-,root,root)
+ %undefine python_ver
%else
%define have_json_c 1
+ %define python_ver 3
%if 0%{?sle_version} >= 150000 || 0%{?is_opensuse}
%define have_apache_rpm_macros 1
%endif
@@ -121,6 +124,7 @@
Patch0: Remove-rpath-from-build.patch
Patch1: slurm-2.4.4-init.patch
Patch2: pam_slurm-Initialize-arrays-and-pass-sizes.patch
+Patch3: check-for-lipmix.so.MAJOR.patch
%{?upgrade:Provides: %{pname} = %{version}}
%{?upgrade:Conflicts: %{pname}}
@@ -143,7 +147,7 @@
%endif
BuildRequires: libbitmask-devel
BuildRequires: libcpuset-devel
-BuildRequires: python
+BuildRequires: python%{?python_ver}
%if 0%{?have_libnuma}
BuildRequires: libnuma-devel
%endif
@@ -245,11 +249,13 @@
with SLURM.
-%package -n libpmi%{pmi_so}
+%package -n libpmi%{pmi_so}%{?upgrade:%{_ver}}
Summary: SLURM PMI Library
Group: System/Libraries
+%{?upgrade:Provides: libpmi%{pmi_so} = %{version}}
+%{?upgrade:Conflicts: libpmi%{pmi_so}}
-%description -n libpmi%{pmi_so}
+%description -n libpmi%{pmi_so}%{?upgrade:%{_ver}}
This package contains the library needed to run programs dynamically linked
with SLURM.
@@ -258,7 +264,7 @@
Group: System/Libraries
%description -n libnss_%{pname}%{nss_so}
-libnss_slurm is an optional NSS plugin that permits password and group
+ibnss_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
slurmstepd process.
@@ -365,6 +371,9 @@
Provides: torque-client
%{?upgrade:Provides: %{pname}-torque = %{version}}
%{?upgrade:Conflicts: %{pname}-torque}
+%if %{with pmix}
+Requires: libpmix%{pmix_so}
+%endif
%description torque
Wrapper scripts for aiding migration from Torque/PBS to SLURM.
@@ -520,12 +529,19 @@
%prep
%setup -q -n %{pname}-%{dl_ver}
-%patch0 -p2
+%patch0 -p1
%patch1 -p1
%patch2 -p1
+%patch3 -p1
+%if 0%{?python_ver} < 3
+# Workaround for wrongly flagged python3 to keep SLE-11-SP4 building
+mkdir -p mybin; ln -s /usr/bin/python2 mybin/python3
+%endif
%build
%define _lto_cflags %{nil}
+[ -e $(pwd)/mybin ] && PATH=$(pwd)/mybin:$PATH
+export CPPFLAGS=-DPMIX_SO=%{pmix_so}
%configure --enable-shared \
--disable-static \
--without-rpath \
@@ -543,6 +559,7 @@
make %{?_smp_mflags}
%install
+[ -e $(pwd)/mybin ] && PATH=$(pwd)/mybin:$PATH
%make_install
make install-contrib DESTDIR=%{buildroot} PERL_MM_PARAMS="INSTALLDIRS=vendor"
@@ -824,8 +841,8 @@
%post -n %{libslurm} -p /sbin/ldconfig
%postun -n %{libslurm} -p /sbin/ldconfig
-%post -n libpmi%{pmi_so} -p /sbin/ldconfig
-%postun -n libpmi%{pmi_so} -p /sbin/ldconfig
+%post -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
%postun -n libnss_%{pname}%{nss_so} -p /sbin/ldconfig
@@ -965,7 +982,7 @@
%{?comp_at}
%{_libdir}/libslurm*.so.%{so_version}*
-%files -n libpmi%{pmi_so}
+%files -n libpmi%{pmi_so}%{?upgrade:%{_ver}}
%{?comp_at}
%{_libdir}/libpmi*.so.%{pmi_so}*
++++++ Remove-rpath-from-build.patch ++++++
--- /var/tmp/diff_new_pack.hjxYkb/_old 2020-03-06 12:44:18.898867996 +0100
+++ /var/tmp/diff_new_pack.hjxYkb/_new 2020-03-06 12:44:18.898867996 +0100
@@ -10,10 +10,10 @@
slurm-19.05.5/contribs/perlapi/libslurm/perl/Makefile.PL.in | 4 ++--
slurm-19.05.5/contribs/perlapi/libslurmdb/perl/Makefile.PL.in | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
-diff --git a/slurm-19.05.5/contribs/perlapi/libslurm/perl/Makefile.PL.in
b/slurm-19.05.5/contribs/perlapi/libslurm/perl/Makefile.PL.in
+diff --git a/contribs/perlapi/libslurm/perl/Makefile.PL.in
b/contribs/perlapi/libslurm/perl/Makefile.PL.in
index fcae437..797c943 100644
---- a/slurm-19.05.5/contribs/perlapi/libslurm/perl/Makefile.PL.in
-+++ b/slurm-19.05.5/contribs/perlapi/libslurm/perl/Makefile.PL.in
+--- a/contribs/perlapi/libslurm/perl/Makefile.PL.in
++++ b/contribs/perlapi/libslurm/perl/Makefile.PL.in
@@ -77,7 +77,7 @@ DESTDIR_BUG
# AIX has problems with not always having the correct
# flags so we have to add some :)
@@ -32,10 +32,10 @@
DEFINE => '', # e.g., '-DHAVE_SOMETHING'
INC => "-I. -I@top_srcdir@
-I@top_srcdir@/contribs/perlapi/common -I@top_builddir@",
# Un-comment this if you add C files to link with later:
-diff --git a/slurm-19.05.5/contribs/perlapi/libslurmdb/perl/Makefile.PL.in
b/slurm-19.05.5/contribs/perlapi/libslurmdb/perl/Makefile.PL.in
+diff --git a/contribs/perlapi/libslurmdb/perl/Makefile.PL.in
b/contribs/perlapi/libslurmdb/perl/Makefile.PL.in
index 2db028c..83eb4e2 100644
---- a/slurm-19.05.5/contribs/perlapi/libslurmdb/perl/Makefile.PL.in
-+++ b/slurm-19.05.5/contribs/perlapi/libslurmdb/perl/Makefile.PL.in
+--- a/contribs/perlapi/libslurmdb/perl/Makefile.PL.in
++++ b/contribs/perlapi/libslurmdb/perl/Makefile.PL.in
@@ -76,7 +76,7 @@ DESTDIR_BUG
# AIX has problems with not always having the correct
# flags so we have to add some :)
++++++ check-for-lipmix.so.MAJOR.patch ++++++
From: Christian Goll <cg...@suse.com>
Date: Thu Feb 27 17:09:11 2020 +0100
Subject: check for lipmix.so.MAJOR
Patch-mainline: Not yet
Git-commit: 6a280d70ba914a4c9734986b353fbb0e76eb664b
References:
This is a hack with a safety net included: make sure
PMIX version is 3 for PMX .so version 2.
Edited-by: Egbert Eich <e...@suse.com>
---
slurm-20.02.0/src/plugins/mpi/pmix/mpi_pmix.c | 17 ++++++++++++++++-
1 file changed, 16 insertions(+), 1 deletion(-)
diff --git a/src/plugins/mpi/pmix/mpi_pmix.c b/src/plugins/mpi/pmix/mpi_pmix.c
index 7a65895..e18b01d 100644
--- a/src/plugins/mpi/pmix/mpi_pmix.c
+++ b/src/plugins/mpi/pmix/mpi_pmix.c
@@ -109,6 +109,18 @@ static void *_libpmix_open(void)
#endif
xstrfmtcat(full_path, "libpmix.so");
+/*
+ * pmix.so library age is 2 for pmi version 3
+ */
+#if defined (PMIX_SO)
+# if HAVE_PMIX_VER != 3 || PMIX_SO != 2
+# error PMIX .so != 2 or PMIX version != 3
+# else
+# define PMIX_SO_STRING "2"
+# endif
+ lib_plug = dlopen("libpmix.so."PMIX_SO_STRING, RTLD_LAZY |
RTLD_GLOBAL);
+ if(!lib_plug)
+#endif
lib_plug = dlopen(full_path, RTLD_LAZY | RTLD_GLOBAL);
xfree(full_path);
@@ -130,7 +145,7 @@ extern int init(void)
{
libpmix_plug = _libpmix_open();
if (!libpmix_plug) {
- PMIXP_ERROR("pmi/pmix: can not load PMIx library");
+ PMIXP_ERROR("pmi/pmix: can not load PMIx library: %d",(int)
HAVE_PMIX_VER);
return SLURM_ERROR;
}
return SLURM_SUCCESS;
++++++ slurm-20.02.0-0rc1.tar.bz2 -> slurm-20.02.0.tar.bz2 ++++++
/work/SRC/openSUSE:Leap:15.2/slurm/slurm-20.02.0-0rc1.tar.bz2
/work/SRC/openSUSE:Leap:15.2/.slurm.new.26092/slurm-20.02.0.tar.bz2 differ:
char 11, line 1
