Skip to content

Commit

Permalink
Merge pull request #578 from ocaisa/allow_loaded_eessi_extend
Browse files Browse the repository at this point in the history
Allow `EESSI-extend` as a loaded module when using EasyBuild
  • Loading branch information
bedroge authored Jun 7, 2024
2 parents 354a282 + 51118ef commit 547a76c
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 2 deletions.
10 changes: 8 additions & 2 deletions EESSI-extend-2023.06-easybuild.eb
Original file line number Diff line number Diff line change
Expand Up @@ -139,12 +139,17 @@ setenv ("EASYBUILD_SYSROOT", sysroot)
setenv ("EASYBUILD_PREFIX", pathJoin(working_dir, "easybuild"))
setenv ("EASYBUILD_INSTALLPATH", easybuild_installpath)
setenv ("EASYBUILD_HOOKS", pathJoin(os.getenv("EESSI_PREFIX"), "init", "easybuild", "eb_hooks.py"))
setenv ("EASYBUILD_UMASK", "002")
-- Make sure to use the general umask that allows a global read
setenv ("EASYBUILD_UMASK", "022")
-- Allow this module to be loaded when running EasyBuild
setenv ("EASYBUILD_ALLOW_LOADED_MODULES", "EasyBuild,EESSI-extend")
-- Set all related environment variables if we have project or user installations (including extending MODULEPATH)
if (user_modulepath ~= nil) then
-- Use a more restrictive umask for this case
setenv ("EASYBUILD_UMASK", "022")
setenv ("EASYBUILD_UMASK", "077")
setenv ("EASYBUILD_STICKY_BIT", "1")
-- configure MODULEPATH
if (project_modulepath ~= nil) then
Expand All @@ -155,6 +160,7 @@ elseif (project_modulepath ~= nil) then
setenv ("EASYBUILD_SET_GID_BIT", "1")
setenv ("EASYBUILD_GROUP_WRITABLE_INSTALLDIR", "1")
setenv ("EASYBUILD_STICKY_BIT", "0")
setenv ("EASYBUILD_UMASK", "002")
-- configure MODULEPATH
prepend_path("MODULEPATH", project_modulepath)
end
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
# 2024.05.15
# The module is an EasyBuild created module and therefore needs to be an allowed
# module when running EasyBuild
easyconfigs:
- EESSI-extend-2023.06-easybuild.eb

0 comments on commit 547a76c

Please sign in to comment.