[rpms/slurm] epel10: do not build/install pmi/pmi2

[rpms/slurm] epel10: do not build/install pmi/pmi2

[Philip Kovacs]

A new commit has been pushed.

Repo   : rpms/slurm
Branch : epel10
Commit : b5a466af2dd559afa64817cf37ccc0949b8a936d
Author : Philip Kovacs <pkdevel@yahoo.com>
Date   : 2019-07-05T12:54:05-04:00
Stats  : +126/-106 in 4 file(s)
URL    : https://src.fedoraproject.org/rpms/slurm/c/b5a466af2dd559afa64817cf37ccc0949b8a936d?branch=epel10

Log:
do not build/install pmi/pmi2

---
diff --git a/slurm.spec b/slurm.spec
index af321c4..a3ad352 100644
--- a/slurm.spec
+++ b/slurm.spec
@@ -32,7 +32,8 @@ Patch1:         slurm_fix_testsuite.patch
 Patch10:        slurm_perlapi_rpaths.patch
 Patch11:        slurm_html_doc_path.patch
 Patch12:        slurm_doc_fix.patch
-Patch13:        slurm_do_not_build_cray.patch
+Patch13:        slurm_without_cray.patch
+Patch14:        slurm_without_pmi.patch
 
 # Fedora-related patches
 Patch20:        slurm_pmix_soname.patch
@@ -207,6 +208,7 @@ Torque wrapper scripts used for helping migrate from Torque/PBS to Slurm.
 %patch11 -p1
 %patch12 -p1
 %patch13 -p1
+%patch14 -p1
 %patch20 -p1
 %patch21 -p1
 %patch22 -p1
@@ -366,10 +368,6 @@ install -m 0644 contribs/lua/*.lua %{buildroot}%{_docdir}/%{name}/contribs/lua
 
 # remove libtool archives
 find %{buildroot} -name \*.a -o -name \*.la | xargs rm -f
-# remove pmi/pmi2 headers which are provided by pmix dependency
-rm -rf %{buildroot}%{_includedir}/%{name}/pmi*.h
-# remove libpmi/pmi2 libraries which are provided by pmix dependency
-rm -rf %{buildroot}%{_libdir}/libpmi*.so*
 # remove libslurmfull symlink (non-development, internal library)
 rm -rf %{buildroot}%{_libdir}/libslurmfull.so
 # remove auth_none plugin

diff --git a/slurm_do_not_build_cray.patch b/slurm_do_not_build_cray.patch
deleted file mode 100644
index 8b994dc..0000000
--- a/slurm_do_not_build_cray.patch
+++ /dev/null
@@ -1,101 +0,0 @@
-diff --git a/contribs/Makefile.am b/contribs/Makefile.am
-index da96aa070d..2a2d1f2c82 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
- 
- 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

diff --git a/slurm_without_cray.patch b/slurm_without_cray.patch
new file mode 100644
index 0000000..8b994dc
--- /dev/null
+++ b/slurm_without_cray.patch
@@ -0,0 +1,101 @@
+diff --git a/contribs/Makefile.am b/contribs/Makefile.am
+index da96aa070d..2a2d1f2c82 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
+ 
+ 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

diff --git a/slurm_without_pmi.patch b/slurm_without_pmi.patch
new file mode 100644
index 0000000..a51659f
--- /dev/null
+++ b/slurm_without_pmi.patch
@@ -0,0 +1,22 @@
+diff --git a/Makefile.am b/Makefile.am
+index 064e992d53..10859a78a5 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -29,7 +29,6 @@ EXTRA_DIST =			\
+ 	META
+ 
+ pkginclude_HEADERS =		\
+-	slurm/pmi.h		\
+ 	slurm/slurm.h 		\
+ 	slurm/slurmdb.h 	\
+ 	slurm/slurm_errno.h	\
+diff --git a/contribs/Makefile.am b/contribs/Makefile.am
+index 2a2d1f2c82..d8d268c0e7 100644
+--- a/contribs/Makefile.am
++++ b/contribs/Makefile.am
+@@ -1,4 +1,4 @@
+-SUBDIRS = 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 seff sgather sgi sjobexit torque
+ 
+ EXTRA_DIST = \
+ 	make-3.81.slurm.patch	\