Hello community, here is the log from the commit of package slurm for openSUSE:Factory checked in at 2020-03-01 21:27:50 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/slurm (Old) and /work/SRC/openSUSE:Factory/.slurm.new.26092 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "slurm" Sun Mar 1 21:27:50 2020 rev:41 rq:780356 version:20.02.0 Changes: -------- --- /work/SRC/openSUSE:Factory/slurm/slurm.changes 2020-02-28 15:21:36.765926284 +0100 +++ /work/SRC/openSUSE:Factory/.slurm.new.26092/slurm.changes 2020-03-01 21:28:16.468588222 +0100 @@ -1,0 +2,5 @@ +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. + +------------------------------------------------------------------- @@ -4,0 +10,8 @@ + +------------------------------------------------------------------- +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 New: ---- check-for-lipmix.so.MAJOR.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ slurm.spec ++++++ --- /var/tmp/diff_new_pack.UNGLNF/_old 2020-03-01 21:28:17.976591286 +0100 +++ /var/tmp/diff_new_pack.UNGLNF/_new 2020-03-01 21:28:17.976591286 +0100 @@ -24,6 +24,7 @@ # so-version is 0 and seems to be stable %define pmi_so 0 %define nss_so 2 +%define pmix_so 2 %define pname slurm @@ -123,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}} @@ -262,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. @@ -369,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. @@ -524,9 +529,10 @@ %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 @@ -535,6 +541,7 @@ %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 \ ++++++ Remove-rpath-from-build.patch ++++++ --- /var/tmp/diff_new_pack.UNGLNF/_old 2020-03-01 21:28:17.996591326 +0100 +++ /var/tmp/diff_new_pack.UNGLNF/_new 2020-03-01 21:28:17.996591326 +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;