Skip to content

only use $EESSI_VERSION in init/eessi_defaults #116

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
merged 3 commits into from
Oct 24, 2025
Merged

only use $EESSI_VERSION in init/eessi_defaults #116

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e322646
set EESSI_VERSION early, use it everywhere
bedroge Oct 24, 2025
4965953
add comment about version suffixes
bedroge Oct 24, 2025
292f4e6
use EESSI_VERSION instead of EESSI_VERSION_DEFAULT
bedroge Oct 24, 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
12 changes: 5 additions & 7 deletions init/eessi_defaults
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
# define default values for some EESSI_* environment variables
#
# This file is part of the EESSI software layer,
# see https://github.com/EESSI/software-layer
Expand All @@ -10,11 +9,11 @@

export EESSI_VERSION_DEFAULT='__EESSI_VERSION_DEFAULT__'

export EESSI_VERSION="${EESSI_VERSION_OVERRIDE:=${EESSI_VERSION_DEFAULT}}"

# use different defaults for RISC-V clients
if [[ $(uname -m) == "riscv64" ]]; then
export EESSI_VERSION="${EESSI_VERSION_OVERRIDE:-${EESSI_VERSION_DEFAULT}}"
if [[ "${EESSI_VERSION}" == "2023.06" ]] || [[ "${EESSI_VERSION}" == "20240402" ]]; then
export EESSI_VERSION="${EESSI_VERSION_OVERRIDE:=20240402}"
export EESSI_CVMFS_REPO="${EESSI_CVMFS_REPO_OVERRIDE:=/cvmfs/riscv.eessi.io}"
export EESSI_INIT_PREFIX="${EESSI_CVMFS_REPO}/versions/${EESSI_VERSION}/init"
if [[ -z ${EESSI_SILENT+x} ]]; then
Expand All @@ -23,18 +22,17 @@ if [[ $(uname -m) == "riscv64" ]]; then
echo "For more details about this repository, see https://www.eessi.io/docs/repositories/riscv.eessi.io/."
echo ""
fi
elif [[ "${EESSI_VERSION_DEFAULT}" == "2025.06" ]]; then
elif [[ "${EESSI_VERSION}" == "2025.06"* ]]; then
export EESSI_CVMFS_REPO="${EESSI_CVMFS_REPO_OVERRIDE:=/cvmfs/dev.eessi.io/riscv}"
export EESSI_COMPAT_LAYER_DIR="/cvmfs/software.eessi.io/versions/${EESSI_VERSION_DEFAULT}/compat/linux/$(uname -m)"
export EESSI_INIT_PREFIX="/cvmfs/software.eessi.io/versions/${EESSI_VERSION_DEFAULT}/init"
export EESSI_COMPAT_LAYER_DIR="/cvmfs/software.eessi.io/versions/${EESSI_VERSION}/compat/linux/$(uname -m)"
export EESSI_INIT_PREFIX="/cvmfs/software.eessi.io/versions/${EESSI_VERSION}/init"
if [[ -z ${EESSI_SILENT+x} ]]; then
echo "This EESSI production version only provides a RISC-V compatibility layer,"
echo "software installations are provided by the EESSI development repository at ${EESSI_CVMFS_REPO}."
fi
fi
else
export EESSI_CVMFS_REPO="${EESSI_CVMFS_REPO_OVERRIDE:=/cvmfs/software.eessi.io}"
export EESSI_VERSION="${EESSI_VERSION_OVERRIDE:=${EESSI_VERSION_DEFAULT}}"
export EESSI_INIT_PREFIX="${EESSI_CVMFS_REPO}/versions/${EESSI_VERSION}/init"
fi
# use archdetect by default, unless otherwise specified
Expand Down