From 23f9ac02dc37fe9cbe52a9f66a2c6092cfeb2c71 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bob=20Dr=C3=B6ge?= Date: Thu, 18 Dec 2025 20:08:41 +0100 Subject: [PATCH 1/2] check for easystack file in directory name with sw layer version suffix --- EESSI-install-software.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/EESSI-install-software.sh b/EESSI-install-software.sh index 057c01e8..e4834545 100755 --- a/EESSI-install-software.sh +++ b/EESSI-install-software.sh @@ -384,9 +384,9 @@ else for easystack_file in ${rebuild_easystacks} ${new_easystacks}; do # make sure that easystack file being picked up is for EESSI version that we're building for... - echo "${easystack_file}" | grep -q "^easystacks/$(basename ${EESSI_CVMFS_REPO})/${EESSI_VERSION}/" + echo "${easystack_file}" | grep -q "^easystacks/$(basename ${EESSI_CVMFS_REPO})/${EESSI_VERSION}${EESSI_SOFTWARE_LAYER_VERSION_SUFFIX}/" if [ $? -ne 0 ]; then - echo_yellow "Easystack file ${easystack_file} is not intended for EESSI version ${EESSI_VERSION}, skipping it..." + echo_yellow "Easystack file ${easystack_file} is not intended for EESSI version ${EESSI_VERSION}${EESSI_SOFTWARE_LAYER_VERSION_SUFFIX}, skipping it..." else echo -e "Processing easystack file ${easystack_file}...\n\n" From 95e58ebe67a48adc9ea14bd4b9bce1a544fd5ab7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bob=20Dr=C3=B6ge?= Date: Thu, 18 Dec 2025 20:09:23 +0100 Subject: [PATCH 2/2] also determine version suffix for RISC-V 2025.06 --- init/modules/EESSI/2023.06.lua | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/init/modules/EESSI/2023.06.lua b/init/modules/EESSI/2023.06.lua index ccf410ad..5898bfb8 100644 --- a/init/modules/EESSI/2023.06.lua +++ b/init/modules/EESSI/2023.06.lua @@ -35,9 +35,13 @@ if (subprocess("uname -m"):gsub("\n$","") == "riscv64") then "For more details about this repository, see https://www.eessi.io/docs/repositories/riscv.eessi.io/.") end elseif (eessi_version == "2025.06") then + eessi_version_override = os.getenv("EESSI_VERSION_OVERRIDE") or "" + index_suffix = string.find(eessi_version_override, '-') + if index_suffix then + eessi_software_layer_version_suffix = string.sub(eessi_version_override, index_suffix) + end eessi_repo = "/cvmfs/dev.eessi.io/riscv" - eessi_version = os.getenv("EESSI_VERSION_OVERRIDE") or eessi_version - eessi_prefix = pathJoin(eessi_repo, "versions", eessi_version) + eessi_prefix = pathJoin(eessi_repo, "versions", eessi_version .. eessi_software_layer_version_suffix) if mode() == "load" then LmodMessage("This EESSI production version only provides a RISC-V compatibility layer,\n" .. "software installations are provided by the EESSI development repository at " .. eessi_repo .. ".\n")