From c00dbe5289c19f59fc44fb83b43ee3ec8593f43e Mon Sep 17 00:00:00 2001 From: Philip Kovacs Date: Aug 13 2019 22:25:04 +0000 Subject: Release of 19.05.2 --- diff --git a/.rpmlint b/.rpmlint deleted file mode 100644 index 5aca11b..0000000 --- a/.rpmlint +++ /dev/null @@ -1,9 +0,0 @@ -from Config import * -addFilter("E: shared-lib-without-dependency-information") -addFilter("E: missing-dependency-to-logrotate") -addFilter("W: manual-page-warning") -addFilter("W: no-documentation") -addFilter("W: no-manual-page-for-binary") -addFilter("W: non-conffile-in-etc") -addFilter("W: shared-lib-calls-exit") -addFilter("W: spelling-error") diff --git a/slurm.rpmlintrc b/slurm.rpmlintrc new file mode 100644 index 0000000..24fde8a --- /dev/null +++ b/slurm.rpmlintrc @@ -0,0 +1,8 @@ +addFilter("E: shared-lib-without-dependency-information") +addFilter("E: missing-dependency-to-logrotate") +addFilter("W: manual-page-warning") +addFilter("W: no-documentation") +addFilter("W: no-manual-page-for-binary") +addFilter("W: non-conffile-in-etc") +addFilter("W: shared-lib-calls-exit") +addFilter("W: spelling-error") diff --git a/slurm.spec b/slurm.spec index 20c73b1..3007f86 100644 --- a/slurm.spec +++ b/slurm.spec @@ -1,5 +1,5 @@ # Upstream tarballs use an additional release number -%global ups_rel 2 +%global ups_rel 1 %if "%{ups_rel}" == "1" %global name_version %{name}-%{version} @@ -18,8 +18,8 @@ %undefine _strict_symbol_defs_build Name: slurm -Version: 19.05.1 -Release: 3%{?dist} +Version: 19.05.2 +Release: 1%{?dist} Summary: Simple Linux Utility for Resource Management License: GPLv2 and BSD URL: https://slurm.schedmd.com/ @@ -702,6 +702,9 @@ rm -f %{buildroot}%{perl_archlib}/perllocal.pod %systemd_postun_with_restart slurmdbd.service %changelog +* Tue Aug 13 2019 Philip Kovacs - 19.05.2-1 +- Release of 19.05.2 + * Fri Jul 26 2019 Fedora Release Engineering - 19.05.1-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild diff --git a/slurm_pmix_soname.patch b/slurm_pmix_soname.patch index cb5f88e..c6c2449 100644 --- a/slurm_pmix_soname.patch +++ b/slurm_pmix_soname.patch @@ -1,17 +1,17 @@ diff --git a/src/plugins/mpi/pmix/mpi_pmix.c b/src/plugins/mpi/pmix/mpi_pmix.c -index bbb947616c..b284af63f2 100644 +index c4bdeafc6b..eda8b39e0a 100644 --- a/src/plugins/mpi/pmix/mpi_pmix.c +++ b/src/plugins/mpi/pmix/mpi_pmix.c @@ -89,6 +89,8 @@ const uint32_t plugin_version = SLURM_VERSION_NUMBER; void *libpmix_plug = NULL; -+static const char *pmix_libraries[] = { "libpmix.so", "libpmix.so.2", "libpmix.so.1" }; ++static const char *pmix_libraries[] = { "libpmix.so", "libpmix.so.2" }; + static void _libpmix_close(void *lib_plug) { xassert(lib_plug); -@@ -99,15 +101,20 @@ static void *_libpmix_open(void) +@@ -99,6 +101,7 @@ static void *_libpmix_open(void) { void *lib_plug = NULL; char *full_path = NULL; @@ -19,24 +19,22 @@ index bbb947616c..b284af63f2 100644 #ifdef PMIXP_V1_LIBPATH xstrfmtcat(full_path, "%s/", PMIXP_V1_LIBPATH); - #elif defined PMIXP_V2_LIBPATH - xstrfmtcat(full_path, "%s/", PMIXP_V2_LIBPATH); - #endif -- xstrfmtcat(full_path, "libpmix.so"); -- lib_plug = dlopen(full_path, RTLD_LAZY | RTLD_GLOBAL); -- xfree(full_path); -+ +@@ -112,6 +115,13 @@ static void *_libpmix_open(void) + lib_plug = dlopen(full_path, RTLD_LAZY | RTLD_GLOBAL); + xfree(full_path); + + while (!lib_plug && (sz < sizeof(pmix_libraries)/sizeof(pmix_libraries[0]))) { + xstrfmtcat(full_path, "%s", pmix_libraries[sz]); + lib_plug = dlopen(full_path, RTLD_LAZY | RTLD_GLOBAL); + xfree(full_path); + ++sz; + } - ++ if (lib_plug && (HAVE_PMIX_VER != pmixp_lib_get_version())) { PMIXP_ERROR("pmi/pmix: incorrect PMIx library version loaded %d was loaded, required %d version", + pmixp_lib_get_version(), (int)HAVE_PMIX_VER); diff --git a/src/plugins/mpi/pmix/pmixp_dconn_ucx.c b/src/plugins/mpi/pmix/pmixp_dconn_ucx.c -index f6c91adc93..650fb7d5ff 100644 +index f6c91adc93..506a18e3c1 100644 --- a/src/plugins/mpi/pmix/pmixp_dconn_ucx.c +++ b/src/plugins/mpi/pmix/pmixp_dconn_ucx.c @@ -140,6 +140,8 @@ static struct io_operations _progress_ops = { @@ -48,7 +46,7 @@ index f6c91adc93..650fb7d5ff 100644 static void *_ucx_init(int nodeid, pmixp_p2p_data_t direct_hdr); static void _ucx_fini(void *_priv); static int _ucx_connect(void *_priv, void *ep_data, size_t ep_len, -@@ -161,15 +163,20 @@ static int _load_ucx_lib() +@@ -161,6 +163,8 @@ static int _load_ucx_lib() setenv("UCX_MEM_MALLOC_RELOC", "no", 1); setenv("UCX_MEM_EVENTS", "no", 1); @@ -57,12 +55,10 @@ index f6c91adc93..650fb7d5ff 100644 #ifdef PMIXP_UCX_LIBPATH /* If this Slurm build doesn't allow RPATH's * try to open library by it's full path that - * we have from autoconf - */ - char *full_path = NULL; -- xstrfmtcat(full_path, "%s/libucp.so", PMIXP_UCX_LIBPATH); -- _ucx_lib_handler = dlopen(full_path, RTLD_LAZY | RTLD_GLOBAL); -- xfree(full_path); +@@ -170,6 +174,12 @@ static int _load_ucx_lib() + xstrfmtcat(full_path, "%s/libucp.so", PMIXP_UCX_LIBPATH); + _ucx_lib_handler = dlopen(full_path, RTLD_LAZY | RTLD_GLOBAL); + xfree(full_path); + while (!_ucx_lib_handler && (sz < sizeof(ucx_libraries)/sizeof(ucx_libraries[0]))) { + xstrfmtcat(full_path, "%s/%s", PMIXP_UCX_LIBPATH, ucx_libraries[sz]); + _ucx_lib_handler = dlopen(full_path, RTLD_LAZY | RTLD_GLOBAL); @@ -72,11 +68,10 @@ index f6c91adc93..650fb7d5ff 100644 if (_ucx_lib_handler) { /* successful, exit now */ return SLURM_SUCCESS; -@@ -178,7 +185,13 @@ static int _load_ucx_lib() - * known by dynamic linker. +@@ -179,6 +189,13 @@ static int _load_ucx_lib() */ #endif -- _ucx_lib_handler = dlopen("libucp.so", RTLD_LAZY | RTLD_GLOBAL); + _ucx_lib_handler = dlopen("libucp.so", RTLD_LAZY | RTLD_GLOBAL); + sz = 0; + while (!_ucx_lib_handler && (sz < sizeof(ucx_libraries)/sizeof(ucx_libraries[0]))) { + xstrfmtcat(full_path, "%s", ucx_libraries[sz]); diff --git a/slurm_without_cray.patch b/slurm_without_cray.patch index 8b994dc..ce4aa86 100644 --- a/slurm_without_cray.patch +++ b/slurm_without_cray.patch @@ -79,14 +79,17 @@ index 09fdfd2313..570af23c4a 100644 # 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 +index c58f51329d..39a2b3eb7f 100644 --- a/src/plugins/switch/Makefile.am +++ b/src/plugins/switch/Makefile.am -@@ -1,3 +1,3 @@ +@@ -1,7 +1,3 @@ # Makefile for switch plugins --SUBDIRS = cray_aries generic none -+SUBDIRS = generic none + SUBDIRS = generic none +- +-if WITH_SWITCH_CRAY_ARIES +-SUBDIRS += cray_aries +-endif diff --git a/src/plugins/task/Makefile.am b/src/plugins/task/Makefile.am index 8d2a36eb68..607af1cb7c 100644 --- a/src/plugins/task/Makefile.am diff --git a/sources b/sources index 60733ef..d421ff2 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (slurm-19.05.1-2.tar.bz2) = 49d7fc1bbb9d15a9459268a37742e983785d8fbdd19a771c0b07411fc4d9b6378f48614247991efce5b43c21c277a6b4e998b18231d839128fc5cf4a45172f9b +SHA512 (slurm-19.05.2.tar.bz2) = 3b9ae09b52503f15849fec50026855207c1e2de3a2a179cc5030de7c5e3c27f8beccd06c31562564099c5f8703148ee31ed9ccd3e0d722291a23c8a723ca06aa