Merge pull request #583 from bedroge/init_redirect_riscv

Automatically redirect RISC-V users to `riscv.eessi.io` in init script + initial RISC-V support for archdetect

init/arch_specs/eessi_arch_riscv.spec

@@ -0,0 +1 @@
+# Software path in EESSI 	| Vendor ID 	| List of defining CPU features

init/eessi_archdetect.sh

@@ -85,6 +85,7 @@ cpupath(){
         "x86_64") local spec_file="eessi_arch_x86.spec";;
         "aarch64") local spec_file="eessi_arch_arm.spec";;
         "ppc64le") local spec_file="eessi_arch_ppc.spec";;
+        "riscv64") local spec_file="eessi_arch_riscv.spec";;
         *) log "ERROR" "cpupath: Unsupported CPU architecture $machine_type"
     esac
     # spec files are located in a subfolder with this script

init/eessi_defaults

@@ -8,8 +8,20 @@
 # license: GPLv2
 #
 
-export EESSI_CVMFS_REPO="${EESSI_CVMFS_REPO_OVERRIDE:=/cvmfs/software.eessi.io}"
-export EESSI_VERSION="${EESSI_VERSION_OVERRIDE:=2023.06}"
+# use different defaults for RISC-V, as we want to redirect to the riscv.eessi.io repo
+if [[ $(uname -m) == "riscv64" ]]; then
+    export EESSI_CVMFS_REPO="${EESSI_CVMFS_REPO_OVERRIDE:=/cvmfs/riscv.eessi.io}"
+    export EESSI_VERSION="${EESSI_VERSION_OVERRIDE:=20240402}"
+    if [[ ! -v EESSI_SILENT ]]; then
+        echo "RISC-V architecture detected, but there is no RISC-V support yet in the production repository."
+        echo "Automatically switching to version ${EESSI_VERSION} of the RISC-V development repository ${EESSI_CVMFS_REPO}."
+        echo "For more details about this repository, see https://www.eessi.io/docs/repositories/riscv.eessi.io/."
+        echo ""
+    fi
+else
+    export EESSI_CVMFS_REPO="${EESSI_CVMFS_REPO_OVERRIDE:=/cvmfs/software.eessi.io}"
+    export EESSI_VERSION="${EESSI_VERSION_OVERRIDE:=2023.06}"
+fi
 # use archdetect by default, unless otherwise specified
 export EESSI_USE_ARCHDETECT="${EESSI_USE_ARCHDETECT:=1}"
 export EESSI_USE_ARCHSPEC="${EESSI_USE_ARCHSPEC:=0}"

init/minimal_eessi_env

@@ -16,7 +16,7 @@ else
     export EESSI_OS_TYPE='macos'
 fi
 
-# aarch64 (Arm 64-bit), ppc64le (POWER 64-bit), x86_64 (x86 64-bit)
+# aarch64 (Arm 64-bit), riscv64 (RISC-V 64-bit), x86_64 (x86 64-bit)
 export EESSI_CPU_FAMILY=$(uname -m)
 
 # set $EPREFIX since that is basically a standard in Gentoo Prefix

install_scripts.sh

@@ -92,7 +92,7 @@ copy_files_by_list ${TOPDIR}/init ${INSTALL_PREFIX}/init "${init_files[@]}"
 
 # Copy for the init/arch_specs directory
 arch_specs_files=(
-   eessi_arch_arm.spec eessi_arch_ppc.spec eessi_arch_x86.spec
+   eessi_arch_arm.spec eessi_arch_ppc.spec eessi_arch_riscv.spec eessi_arch_x86.spec
 )
 copy_files_by_list ${TOPDIR}/init/arch_specs ${INSTALL_PREFIX}/init/arch_specs "${arch_specs_files[@]}"