Skip to content

two more fixes for building RISC-V stacks with a version suffix #140

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
boegel merged 2 commits into from
Dec 18, 2025
Merged

two more fixes for building RISC-V stacks with a version suffix #140

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
23f9ac0
check for easystack file in directory name with sw layer version suffix
bedroge Dec 18, 2025
95e58eb
also determine version suffix for RISC-V 2025.06
bedroge Dec 18, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions EESSI-install-software.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
8 changes: 6 additions & 2 deletions init/modules/EESSI/2023.06.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down