flux-core, flux-sched: add 0.29.0, 0.18.0 and cleanup env vars (#26391)

Problem: Flux expects the `FLUX_PMI_LIBRARY_PATH` to point directly at
the `libpmi.so` installed by Flux.  When the env var is unset,
prepending to it results in this behavior.  In the rare case that the
env var is already set, then the spack `libpmi.so` gets prepended with a
`:`, which Flux then attempts to interpret as a single path.

Solution: don't prepend to the path, instead set the path to point to
the `libpmi.so` (which will be undone when Flux is unloaded).

* flux-core: remove deprecated environment variables

The earliest checksummed version in this package is 0.15.0. As of
0.12.0, wreck (and its associated paths) no longer exist in Flux. As of
0.13.0, the `FLUX_RCX_PATH` variables are no longer used. So clean up
these env vars from the `setup_run_environment`.
This commit is contained in:
Stephen Herbein 2021-10-12 12:39:43 -07:00 committed by GitHub
parent 47554e1e2f
commit 8d04c8d23c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 14 deletions

View File

@ -19,6 +19,7 @@ class FluxCore(AutotoolsPackage):
maintainers = ['SteVwonder']
version('master', branch='master')
version('0.29.0', sha256='c13b40e82d66356e75208a689a495ca01f0a013e2e45ac8ea202ed8224987323')
version('0.28.0', sha256='9a784def7186b0036091bd8d6d8fe5bc3425ab2927e1465e1c9ad266631c285d')
version('0.27.0', sha256='abd46d38081ba6b501adb1c111374b39d6ae72ac1aec9fbbf31943a856541d3a')
version('0.26.0', sha256='58bfd4742c59364b13cd83214e8f70735952d01793800b149cae056fddfeeff1')
@ -148,27 +149,14 @@ def setup_run_environment(self, env):
)
env.prepend_path('FLUX_MODULE_PATH', self.prefix.lib.flux.modules)
env.prepend_path('FLUX_EXEC_PATH', self.prefix.libexec.flux.cmd)
env.prepend_path('FLUX_RC_PATH', self.prefix.etc.flux)
env.prepend_path('FLUX_RC1_PATH', self.prefix.etc.flux.rc1)
env.prepend_path('FLUX_RC3_PATH', self.prefix.etc.flux.rc3)
env.prepend_path(
'FLUX_CONNECTOR_PATH',
self.prefix.lib.flux.connectors
)
env.prepend_path(
env.set_path(
'FLUX_PMI_LIBRARY_PATH',
os.path.join(self.prefix.lib.flux, "libpmi.so")
)
# Wreck was removed in 0.12
if self.version < Version("0.12.0"):
env.prepend_path(
'FLUX_WREXECD_PATH',
self.prefix.libexec.flux.wrexecd
)
env.prepend_path(
'FLUX_WRECK_LUA_PATTERN',
os.path.join(self.prefix.etc.wreck, "lua.d", "*.lua")
)
def configure_args(self):
args = ['--enable-pylint=no']

View File

@ -19,6 +19,7 @@ class FluxSched(AutotoolsPackage):
maintainers = ['SteVwonder']
version('master', branch='master')
version('0.18.0', sha256='a4d8a6444fdb7b857b26f47fdea57992b486c9522f4ff92d5a6f547d95b586ae')
version('0.17.0', sha256='5acfcb757e2294a92eaa91be58ba9b42736b88b42d2937de4a78f4642b1c4933')
version('0.16.0', sha256='08313976161c141b9b34e2d44d5a08d1b11302e22d60aeaf878eef84d4bd2884')
version('0.15.0', sha256='ff24d26997f91af415f98734b8117291f5a5001e86dac865b56b3d72980c80c8')