Merge pull request #835 from bedroge/eessi_extend_no_fixed_version

Use `$EESSI_VERSION` for `EESSI-extend` version and filter Yasm dependency on RISC-V
EESSI · Dec 6, 2024 · fa051a3 · fa051a3
2 parents 770f66a + 2d02001
commit fa051a3
Show file tree

Hide file tree

Showing 8 changed files with 15 additions and 8 deletions.
diff --git a/EESSI-extend-2023.06-easybuild.eb → EESSI-extend-easybuild.eb b/EESSI-extend-2023.06-easybuild.eb → EESSI-extend-easybuild.eb
@@ -1,7 +1,8 @@
 easyblock = 'Bundle'
 
 name = 'EESSI-extend'
-version = '2023.06'
+import os
+version = os.getenv('EESSI_VERSION', '2023.06')
 # May have different ways to extend EESSI in future (manually, other tools,...)
 versionsuffix = '-easybuild'
 
@@ -40,7 +41,7 @@ toolchain = SYSTEM
 
 # All the dependencies we filter in EESSI
 local_deps_to_filter = "Autoconf,Automake,Autotools,binutils,bzip2,DBus,flex,gettext,gperf,help2man,intltool,libreadline,libtool,M4,makeinfo,ncurses,util-linux,XZ,zlib"
-local_arch_specific_deps_to_filter = {'aarch64': ',yasm', 'x86_64': ''}
+local_arch_specific_deps_to_filter = {'aarch64': ',Yasm', 'riscv64': ',Yasm', 'x86_64': ''}
 local_deps_to_filter += local_arch_specific_deps_to_filter[ARCH]
 
 # Set the universal EasyBuild variables

diff --git a/easystacks/software.eessi.io/2023.06/eessi-2023.06-eb-4.9.1-001-system.yml b/easystacks/software.eessi.io/2023.06/eessi-2023.06-eb-4.9.1-001-system.yml
@@ -2,7 +2,7 @@ easyconfigs:
   - EasyBuild-4.9.1.eb:
       options:
         from-pr: 20299
-  - EESSI-extend-2023.06-easybuild.eb
+  - EESSI-extend-easybuild.eb
   - EasyBuild-4.9.2.eb:
       options:
         from-pr: 20818
diff --git a/...stacks/software.eessi.io/2023.06/rebuilds/20240506-eb-4.9.1-EESSI-extend-allow-loaded.yml b/...stacks/software.eessi.io/2023.06/rebuilds/20240506-eb-4.9.1-EESSI-extend-allow-loaded.yml
@@ -2,4 +2,4 @@
 # The module is an EasyBuild created module and therefore needs to be an allowed
 # module when running EasyBuild
 easyconfigs:
-  - EESSI-extend-2023.06-easybuild.eb 
+  - EESSI-extend-easybuild.eb
diff --git a/easystacks/software.eessi.io/2023.06/rebuilds/20240925-eb-4.9.4-EESSI-extend.yml b/easystacks/software.eessi.io/2023.06/rebuilds/20240925-eb-4.9.4-EESSI-extend.yml
@@ -2,5 +2,5 @@
 # EESSI-extend did not support LMOD_EXACT_MATCH 
 # (see https://github.com/EESSI/software-layer/pull/747)
 easyconfigs:
-  - EESSI-extend-2023.06-easybuild.eb
+  - EESSI-extend-easybuild.eb
 
diff --git a/easystacks/software.eessi.io/2023.06/rebuilds/20241008-eb-4.9.4-EESSI-extend.yml b/easystacks/software.eessi.io/2023.06/rebuilds/20241008-eb-4.9.4-EESSI-extend.yml
@@ -1,5 +1,5 @@
 # 2024.10.08
 # EESSI-extend should use EESSI_SITE_INSTALLPATH, instead of recalculating this
 easyconfigs:
-  - EESSI-extend-2023.06-easybuild.eb
+  - EESSI-extend-easybuild.eb
 
diff --git a/easystacks/software.eessi.io/2023.06/rebuilds/20241112-eb-4.9.4-EESSI-extend.yml b/easystacks/software.eessi.io/2023.06/rebuilds/20241112-eb-4.9.4-EESSI-extend.yml
@@ -3,4 +3,4 @@
 # EESSI-extend should adjust EASYBUILD_INSTALLPATH and set
 # EASYBUILD_CUDA_COMPUTE_CAPABILITIES
 easyconfigs:
-  - EESSI-extend-2023.06-easybuild.eb
+  - EESSI-extend-easybuild.eb
diff --git a/easystacks/software.eessi.io/2023.06/rebuilds/20241206-eb-4.9.4-EESSI-extend.yml b/easystacks/software.eessi.io/2023.06/rebuilds/20241206-eb-4.9.4-EESSI-extend.yml
@@ -0,0 +1,6 @@
+# 2024.12.06
+# - Use $EESSI_VERSION to determine version of EESSI-extend module
+# - Fix the filtered dependencies for aarch64: Yasm instead of yasm
+# - Also add filtered dependencies for RISC-V
+easyconfigs:
+  - EESSI-extend-easybuild.eb
diff --git a/load_eessi_extend_module.sh b/load_eessi_extend_module.sh
@@ -93,7 +93,7 @@ else
         fail_msg="Installing EESSI-extend/${EESSI_EXTEND_VERSION} failed, that's not good... (output: ${eb_install_out})"
         # while always adding --try-amend=keep... may do no harm, we could make
         # an attempt to figure out if it is needed, e.g., when we are rebuilding
-        ${EB} "EESSI-extend-${EESSI_EXTEND_VERSION}.eb" --try-amend=keeppreviousinstall=True 2>&1 | tee ${eb_install_out}
+        ${EB} "EESSI-extend-easybuild.eb" --try-amend=keeppreviousinstall=True 2>&1 | tee ${eb_install_out}
         check_exit_code $? "${ok_msg}" "${fail_msg}"
     )