From 986c9f11b88f3feb0d53ccad0a35bb42e7d4586e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bob=20Dr=C3=B6ge?= Date: Tue, 10 Dec 2024 09:28:40 +0100 Subject: [PATCH 1/3] detect and redirect RISC-V clients --- init/modules/EESSI/2023.06.lua | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/init/modules/EESSI/2023.06.lua b/init/modules/EESSI/2023.06.lua index 348699c0f1..04268f30e1 100644 --- a/init/modules/EESSI/2023.06.lua +++ b/init/modules/EESSI/2023.06.lua @@ -12,6 +12,13 @@ whatis("URL: https://www.eessi.io/docs/") conflict("EESSI") local eessi_version = myModuleVersion() local eessi_repo = "/cvmfs/software.eessi.io" +if (capture("uname -m"):gsub("\n$","") == "riscv64") then + eessi_version = os.getenv("EESSI_VERSION_OVERRIDE") or "20240402" + eessi_repo = "/cvmfs/riscv.eessi.io" + 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" .. + "For more details about this repository, see https://www.eessi.io/docs/repositories/riscv.eessi.io/.") +end local eessi_prefix = pathJoin(eessi_repo, "versions", eessi_version) local eessi_os_type = "linux" setenv("EESSI_VERSION", eessi_version) From b6439951050dde21a52be08d48b93d426d56e986 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bob=20Dr=C3=B6ge?= Date: Tue, 10 Dec 2024 09:29:16 +0100 Subject: [PATCH 2/3] add 20240402 symlink for RISC-V repo --- init/modules/EESSI/20240402.lua | 1 + 1 file changed, 1 insertion(+) create mode 120000 init/modules/EESSI/20240402.lua diff --git a/init/modules/EESSI/20240402.lua b/init/modules/EESSI/20240402.lua new file mode 120000 index 0000000000..cbf80d1fcd --- /dev/null +++ b/init/modules/EESSI/20240402.lua @@ -0,0 +1 @@ +2023.06.lua \ No newline at end of file From c738b64fbb73b932aeea58ea908e262e65e45eea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bob=20Dr=C3=B6ge?= Date: Tue, 10 Dec 2024 09:55:56 +0100 Subject: [PATCH 3/3] use subprocess instead of capture --- 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 04268f30e1..eb1cd1753b 100644 --- a/init/modules/EESSI/2023.06.lua +++ b/init/modules/EESSI/2023.06.lua @@ -12,7 +12,7 @@ whatis("URL: https://www.eessi.io/docs/") conflict("EESSI") local eessi_version = myModuleVersion() local eessi_repo = "/cvmfs/software.eessi.io" -if (capture("uname -m"):gsub("\n$","") == "riscv64") then +if (subprocess("uname -m"):gsub("\n$","") == "riscv64") then eessi_version = os.getenv("EESSI_VERSION_OVERRIDE") or "20240402" eessi_repo = "/cvmfs/riscv.eessi.io" LmodMessage("RISC-V architecture detected, but there is no RISC-V support yet in the production repository.\n" ..