From 5e38d148d8e77409c17898de4c7b80c955c17dcf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bob=20Dr=C3=B6ge?= Date: Fri, 26 Sep 2025 16:27:51 +0200 Subject: [PATCH 1/2] set eprefix correctly for RISC-V --- init/modules/EESSI/2023.06.lua | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/init/modules/EESSI/2023.06.lua b/init/modules/EESSI/2023.06.lua index 46375bf7..2adb6a68 100644 --- a/init/modules/EESSI/2023.06.lua +++ b/init/modules/EESSI/2023.06.lua @@ -14,6 +14,7 @@ conflict("EESSI") local eessi_version = myModuleVersion() local eessi_repo = "/cvmfs/software.eessi.io" local eessi_prefix = pathJoin(eessi_repo, "versions", eessi_version) +local eessi_compat_prefix = pathJoin(eessi_prefix, "compat") local eessi_archdetect_prefix = pathJoin(eessi_prefix, "init") local eessi_os_type = "linux" -- for RISC-V clients we need to do some overrides, as things are stored in different CVMFS repositories @@ -22,6 +23,7 @@ if (subprocess("uname -m"):gsub("\n$","") == "riscv64") then eessi_version = os.getenv("EESSI_VERSION_OVERRIDE") or "20240402" eessi_repo = "/cvmfs/riscv.eessi.io" eessi_prefix = pathJoin(eessi_repo, "versions", eessi_version) + eessi_compat_prefix = pathJoin(eessi_prefix, "compat") if mode() == "load" then LmodMessage("RISC-V architecture detected, but there is no RISC-V support yet in the production repository.\n" .. "Automatically switching to version " .. eessi_version .. " of the RISC-V development repository " .. eessi_repo .. ".\n" .. @@ -105,7 +107,7 @@ local archdetect_accel = archdetect_accel() local eessi_cpu_family = archdetect:match("([^/]+)") local eessi_software_subdir = archdetect -- eessi_eprefix is the base location of the compat layer, e.g., /cvmfs/software.eessi.io/versions//compat/linux/x86_64 -local eessi_eprefix = pathJoin(eessi_prefix, "compat", eessi_os_type, eessi_cpu_family) +local eessi_eprefix = pathJoin(eessi_compat_prefix, eessi_os_type, eessi_cpu_family) -- eessi_software_path is the location of the software installations, e.g., -- /cvmfs/software.eessi.io/versions//software/linux/x86_64/amd/zen3 local eessi_software_path = pathJoin(eessi_prefix, "software", eessi_os_type, eessi_software_subdir) From 3a4b55c1364ba13b47102ac45a6aa3be3764495c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bob=20Dr=C3=B6ge?= Date: Fri, 26 Sep 2025 16:40:54 +0200 Subject: [PATCH 2/2] replace tab by spaces --- init/modules/EESSI/2023.06.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/init/modules/EESSI/2023.06.lua b/init/modules/EESSI/2023.06.lua index 2adb6a68..d8a83efb 100644 --- a/init/modules/EESSI/2023.06.lua +++ b/init/modules/EESSI/2023.06.lua @@ -23,7 +23,7 @@ if (subprocess("uname -m"):gsub("\n$","") == "riscv64") then eessi_version = os.getenv("EESSI_VERSION_OVERRIDE") or "20240402" eessi_repo = "/cvmfs/riscv.eessi.io" eessi_prefix = pathJoin(eessi_repo, "versions", eessi_version) - eessi_compat_prefix = pathJoin(eessi_prefix, "compat") + eessi_compat_prefix = pathJoin(eessi_prefix, "compat") if mode() == "load" then LmodMessage("RISC-V architecture detected, but there is no RISC-V support yet in the production repository.\n" .. "Automatically switching to version " .. eessi_version .. " of the RISC-V development repository " .. eessi_repo .. ".\n" ..