Staged for 5.x

openhpc · Sep 12, 2023 · 0f99f6f · 0f99f6f
1 parent cb9e2a1
commit 0f99f6f
Show file tree

Hide file tree

Showing 8 changed files with 49 additions and 158 deletions.
diff --git a/components/rms/openpbs/SPECS/openpbs.spec b/components/rms/openpbs/SPECS/openpbs.spec
@@ -189,7 +189,7 @@ Autoreq: 1
 # package is not actually installed on the compute nodes.
 # As slurm pulls in pmix for Open MPI in slurm deployments,
 # let's have openpbs pull pmix for openpbs deployments.
-Requires: pmix%{PROJ_DELIM}
+Requires: openpmix%{PROJ_DELIM}
 
 %description -n %{pbs_name}-%{pbs_execution}%{PROJ_DELIM}
 OpenPBS is a fast, powerful workload manager and

diff --git a/components/rms/openpmix/LICENSE b/components/rms/openpmix/LICENSE
diff --git a/components/rms/openpmix/SOURCES/openpmix.lua b/components/rms/openpmix/SOURCES/openpmix.lua
@@ -0,0 +1,21 @@
+help([[
+This module loads the %{pname} library.
+]])
+
+whatis("Name:    %{pname}")
+whatis("Version: %{version}")
+
+local version = "%{version}"
+
+prepend_path("MANPATH",         "%{install_path}/share/man")
+prepend_path("INCLUDE",         "%{install_path}/include")
+prepend_path("LD_LIBRARY_PATH", "%{install_path}/lib")
+
+setenv("%{PNAME}_DIR", "%{install_path}")
+setenv("%{PNAME}_LIB", "%{install_path}/lib")
+setenv("%{PNAME}_INC", "%{install_path}/include")
+setenv("%{SNAME}_DIR", "%{install_path}")
+setenv("%{SNAME}_LIB", "%{install_path}/lib")
+setenv("%{SNAME}_INC", "%{install_path}/include")
+
+family("PMIx")
diff --git a/components/rms/openpmix/SPECS/openpmix.spec b/components/rms/openpmix/SPECS/openpmix.spec
@@ -15,12 +15,13 @@
 
 Summary: An extended/exascale implementation of the PMIx Standard
 Name: %{pname}%{PROJ_DELIM}
-Version: 5.0.0rc1
+Version: 5.0.1
 Release: 1%{?dist}
 License: BSD
 URL: https://openpmix.github.io/openpmix/
 Group: %{PROJ_NAME}/rms
 Source0: https://github.com/openpmix/openpmix/releases/download/v%{version}/%{sname}-%{version}.tar.gz
+Source1: openpmix.lua
 
 Obsoletes: pmix-%{PROJ_DELIM}
 
@@ -39,8 +40,6 @@ BuildRequires: hwloc%{PROJ_DELIM}
 BuildRequires: munge-devel
 BuildRequires: automake
 BuildRequires: autoconf
-BuildRequires: slurm%{PROJ_DELIM}
-BuildRequires: openpbs-server%{PROJ_DELIM}
 
 #!BuildIgnore: post-build-checks
 
@@ -96,27 +95,7 @@ make install DESTDIR=${RPM_BUILD_ROOT}
 # OpenPMIx Module File
 mkdir -p ${RPM_BUILD_ROOT}%{module_path}
 cat <<EOF > ${RPM_BUILD_ROOT}%{module_path}/%{version}.lua
-help([[
-This module loads the %{pname} library.
-]])
-
-whatis("Name:    %{pname}")
-whatis("Version: %{version}")
-
-local version = "%{version}"
-
-prepend_path("MANPATH",         "%{install_path}/share/man")
-prepend_path("INCLUDE",         "%{install_path}/include")
-prepend_path("LD_LIBRARY_PATH", "%{install_path}/lib")
-
-setenv("%{PNAME}_DIR", "%{install_path}")
-setenv("%{PNAME}_LIB", "%{install_path}/lib")
-setenv("%{PNAME}_INC", "%{install_path}/include")
-setenv("%{SNAME}_DIR", "%{install_path}")
-setenv("%{SNAME}_LIB", "%{install_path}/lib")
-setenv("%{SNAME}_INC", "%{install_path}/include")
-
-family("PMIx")
+%include %{SOURCE1}
 EOF
 
 

diff --git a/components/rms/prrte/SOURCES/prrte.lua b/components/rms/prrte/SOURCES/prrte.lua
@@ -0,0 +1,18 @@
+help([[
+This module loads the %{pname} library.
+]])
+
+whatis("Name: %{pname}")
+whatis("Version: %{version}")
+
+local version = "%{version}"
+
+prepend_path("MANPATH",      "%{install_path}/share/man")
+prepend_path("INCLUDE",      "%{install_path}/include")
+prepend_path("LIBRARY_PATH", "%{install_path}/lib")
+
+setenv("%{PNAME}_DIR", "%{install_path}")
+setenv("%{PNAME}_LIB", "%{install_path}/lib")
+setenv("%{PNAME}_INC", "%{install_path}/include")
+
+family("PMIx")
diff --git a/components/rms/openpmix/SOURCES/rpmlintrc → components/rms/prrte/SOURCES/rpmlintrc b/components/rms/openpmix/SOURCES/rpmlintrc → components/rms/prrte/SOURCES/rpmlintrc
diff --git a/components/rms/openpmix/SPECS/prrte.spec → components/rms/prrte/SPECS/prrte.spec b/components/rms/openpmix/SPECS/prrte.spec → components/rms/prrte/SPECS/prrte.spec
@@ -13,26 +13,17 @@
 
 Summary: Reference RunTime Environment for PMIx
 Name: %{pname}%{PROJ_DELIM}
-Version: 3.0.1rc2
+Version: 3.0.0
 Release: 1%{?dist}
 License: BSD
 URL: https://openpmix.github.io/openpmix/
 Group: %{PROJ_NAME}/rms
 Source0: https://github.com/openpmix/prrte/releases/download/v%{version}/%{pname}-%{version}.tar.gz
+Source1: prrte.lua
 
-Conflicts: libev
-
-BuildRequires: libevent-devel
-BuildRequires: gcc
-BuildRequires: gcc-c++
-BuildRequires: zlib-devel
-BuildRequires: hwloc%{PROJ_DELIM}
-BuildRequires: munge-devel
-BuildRequires: automake
-BuildRequires: autoconf
+BuildRequires: openpmix%{PROJ_DELIM} > 5.0.0
 BuildRequires: slurm%{PROJ_DELIM}
 BuildRequires: openpbs-server%{PROJ_DELIM}
-BuildRequires: openpmix%{PROJ_DELIM} > 4.2.0
 BuildRequires: flex
 Provides: openpmix-runtime%{PROJ_DELIM} = %{version}
 
@@ -86,24 +77,7 @@ make install DESTDIR=${RPM_BUILD_ROOT}
 # PRRTE Module File
 mkdir -p ${RPM_BUILD_ROOT}%{module_path}
 cat <<EOF > ${RPM_BUILD_ROOT}%{module_path}/%{version}.lua
-help([[
-This module loads the %{pname} library.
-]])
-
-whatis("Name: %{pname}")
-whatis("Version: %{version}")
-
-local version = "%{version}"
-
-prepend_path("MANPATH",      "%{install_path}/share/man")
-prepend_path("INCLUDE",      "%{install_path}/include")
-prepend_path("LIBRARY_PATH", "%{install_path}/lib")
-
-setenv("%{PNAME}_DIR", "%{install_path}")
-setenv("%{PNAME}_LIB", "%{install_path}/lib")
-setenv("%{PNAME}_INC", "%{install_path}/include")
-
-family("PMIx")
+%include %{SOURCE1}
 EOF
 
 

diff --git a/components/rms/slurm/SPECS/slurm.spec b/components/rms/slurm/SPECS/slurm.spec
@@ -180,8 +180,8 @@ BuildRequires: numactl-devel
 %endif
 
 %if %{with pmix}
-BuildRequires: pmix%{PROJ_DELIM}
-Requires: pmix%{PROJ_DELIM}
+BuildRequires: openpmix%{PROJ_DELIM}
+Requires: openpmix%{PROJ_DELIM}
 %endif
 
 %if %{with ucx} && "%{_with_ucx}" == "--with-ucx"