From 6cf63359d04a7662ae3aa021763765bf01d5f8c7 Mon Sep 17 00:00:00 2001 From: Alan O'Cais Date: Wed, 15 May 2024 16:06:35 +0200 Subject: [PATCH 1/4] Allow EESSI-extend as a loaded module when using EasyBuild --- EESSI-extend-2023.06-easybuild.eb | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/EESSI-extend-2023.06-easybuild.eb b/EESSI-extend-2023.06-easybuild.eb index 76e96766f9..42defbacc8 100644 --- a/EESSI-extend-2023.06-easybuild.eb +++ b/EESSI-extend-2023.06-easybuild.eb @@ -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") + +-- All 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 @@ -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 From fbdb8461fca7dbb28add02b128877d5b59bb24fc Mon Sep 17 00:00:00 2001 From: Alan O'Cais Date: Wed, 15 May 2024 16:11:17 +0200 Subject: [PATCH 2/4] Rebuild the module --- .../20240506--eb-4.9.1-EESSI-extend-allow-loaded.yml | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 easystacks/software.eessi.io/2023.06/rebuilds/20240506--eb-4.9.1-EESSI-extend-allow-loaded.yml diff --git a/easystacks/software.eessi.io/2023.06/rebuilds/20240506--eb-4.9.1-EESSI-extend-allow-loaded.yml b/easystacks/software.eessi.io/2023.06/rebuilds/20240506--eb-4.9.1-EESSI-extend-allow-loaded.yml new file mode 100644 index 0000000000..5cf2bd6b9d --- /dev/null +++ b/easystacks/software.eessi.io/2023.06/rebuilds/20240506--eb-4.9.1-EESSI-extend-allow-loaded.yml @@ -0,0 +1,5 @@ +# 2024.05.15 +# The module is an EasyBuil created module and therefore needs to be an allowed +# module when running EasyBuild +easyconfigs: + - EESSI-extend-2023.06-easybuild.eb From 46d9018f40db4ca174f60746102335ba87ad53b5 Mon Sep 17 00:00:00 2001 From: ocaisa Date: Fri, 7 Jun 2024 12:03:50 +0200 Subject: [PATCH 3/4] Apply suggestions from code review MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Bob Dröge --- EESSI-extend-2023.06-easybuild.eb | 2 +- .../rebuilds/20240506--eb-4.9.1-EESSI-extend-allow-loaded.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/EESSI-extend-2023.06-easybuild.eb b/EESSI-extend-2023.06-easybuild.eb index 42defbacc8..b525ee462d 100644 --- a/EESSI-extend-2023.06-easybuild.eb +++ b/EESSI-extend-2023.06-easybuild.eb @@ -143,7 +143,7 @@ setenv ("EASYBUILD_HOOKS", pathJoin(os.getenv("EESSI_PREFIX"), "init", "easybuil -- Make sure to use the general umask that allows a global read setenv ("EASYBUILD_UMASK", "022") --- All this module to be loaded when running EasyBuild +-- 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) diff --git a/easystacks/software.eessi.io/2023.06/rebuilds/20240506--eb-4.9.1-EESSI-extend-allow-loaded.yml b/easystacks/software.eessi.io/2023.06/rebuilds/20240506--eb-4.9.1-EESSI-extend-allow-loaded.yml index 5cf2bd6b9d..93c4950fc8 100644 --- a/easystacks/software.eessi.io/2023.06/rebuilds/20240506--eb-4.9.1-EESSI-extend-allow-loaded.yml +++ b/easystacks/software.eessi.io/2023.06/rebuilds/20240506--eb-4.9.1-EESSI-extend-allow-loaded.yml @@ -1,5 +1,5 @@ # 2024.05.15 -# The module is an EasyBuil created module and therefore needs to be an allowed +# 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 From 51118efbea0730b820493ff27dab231f256fb53f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bob=20Dr=C3=B6ge?= Date: Fri, 7 Jun 2024 12:08:09 +0200 Subject: [PATCH 4/4] remove double hyphen in filename --- ...loaded.yml => 20240506-eb-4.9.1-EESSI-extend-allow-loaded.yml} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename easystacks/software.eessi.io/2023.06/rebuilds/{20240506--eb-4.9.1-EESSI-extend-allow-loaded.yml => 20240506-eb-4.9.1-EESSI-extend-allow-loaded.yml} (100%) diff --git a/easystacks/software.eessi.io/2023.06/rebuilds/20240506--eb-4.9.1-EESSI-extend-allow-loaded.yml b/easystacks/software.eessi.io/2023.06/rebuilds/20240506-eb-4.9.1-EESSI-extend-allow-loaded.yml similarity index 100% rename from easystacks/software.eessi.io/2023.06/rebuilds/20240506--eb-4.9.1-EESSI-extend-allow-loaded.yml rename to easystacks/software.eessi.io/2023.06/rebuilds/20240506-eb-4.9.1-EESSI-extend-allow-loaded.yml