From e214f53a98ebdd56e0282ba06f1650f8e100d76e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bob=20Dr=C3=B6ge?= Date: Fri, 6 Dec 2024 11:45:26 +0100 Subject: [PATCH 1/7] remove version number from EESSI-extend easyconfig filename --- EESSI-extend-2023.06-easybuild.eb => EESSI-extend-easybuild.eb | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename EESSI-extend-2023.06-easybuild.eb => EESSI-extend-easybuild.eb (100%) diff --git a/EESSI-extend-2023.06-easybuild.eb b/EESSI-extend-easybuild.eb similarity index 100% rename from EESSI-extend-2023.06-easybuild.eb rename to EESSI-extend-easybuild.eb From 341bcbf0ec2fd16d73c80c2ada80286a62355212 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bob=20Dr=C3=B6ge?= Date: Fri, 6 Dec 2024 11:46:13 +0100 Subject: [PATCH 2/7] determine version with $EESSI_VERSION --- EESSI-extend-easybuild.eb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/EESSI-extend-easybuild.eb b/EESSI-extend-easybuild.eb index bfe7931c8f..21b62461bf 100644 --- a/EESSI-extend-easybuild.eb +++ b/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' From 20ac33b9e3689f99e4cdbf4277db06463e731dfe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bob=20Dr=C3=B6ge?= Date: Fri, 6 Dec 2024 11:48:30 +0100 Subject: [PATCH 3/7] use renamed easyconfig without version number in filename --- load_eessi_extend_module.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/load_eessi_extend_module.sh b/load_eessi_extend_module.sh index 62b6e3f3ae..aa8f659ef1 100755 --- 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}" ) From 7b4e4961325772c0d14484b9e78daa685dd2e23d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bob=20Dr=C3=B6ge?= Date: Fri, 6 Dec 2024 11:56:21 +0100 Subject: [PATCH 4/7] remove 2023.06 from EESSI-extend easyconfig filename --- .../2023.06/eessi-2023.06-eb-4.9.1-001-system.yml | 2 +- .../rebuilds/20240506-eb-4.9.1-EESSI-extend-allow-loaded.yml | 2 +- .../2023.06/rebuilds/20240925-eb-4.9.4-EESSI-extend.yml | 2 +- .../2023.06/rebuilds/20241008-eb-4.9.4-EESSI-extend.yml | 2 +- .../2023.06/rebuilds/20241112-eb-4.9.4-EESSI-extend.yml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) 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 index 866766a36b..748ecc8a02 100644 --- 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/easystacks/software.eessi.io/2023.06/rebuilds/20240506-eb-4.9.1-EESSI-extend-allow-loaded.yml b/easystacks/software.eessi.io/2023.06/rebuilds/20240506-eb-4.9.1-EESSI-extend-allow-loaded.yml index 93c4950fc8..2e0030b05a 100644 --- a/easystacks/software.eessi.io/2023.06/rebuilds/20240506-eb-4.9.1-EESSI-extend-allow-loaded.yml +++ b/easystacks/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 index 9cd1b451cd..5c1eb292e4 100644 --- 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 index 5491ef8427..b1f69e3297 100644 --- 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 index e4c658784f..9b2910a83a 100644 --- 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 From d80dd712209f0c31df1eca9cf6f8fc938ddd9752 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bob=20Dr=C3=B6ge?= Date: Fri, 6 Dec 2024 12:03:52 +0100 Subject: [PATCH 5/7] Yasm instead of yasm --- EESSI-extend-easybuild.eb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/EESSI-extend-easybuild.eb b/EESSI-extend-easybuild.eb index 21b62461bf..d5921b5762 100644 --- a/EESSI-extend-easybuild.eb +++ b/EESSI-extend-easybuild.eb @@ -41,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', 'x86_64': ''} local_deps_to_filter += local_arch_specific_deps_to_filter[ARCH] # Set the universal EasyBuild variables From 79d698a121e876bb1f7e08cc88804bf31e995df5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bob=20Dr=C3=B6ge?= Date: Fri, 6 Dec 2024 12:04:32 +0100 Subject: [PATCH 6/7] also filter Yasm for riscv64 --- EESSI-extend-easybuild.eb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/EESSI-extend-easybuild.eb b/EESSI-extend-easybuild.eb index d5921b5762..f74f36aca7 100644 --- a/EESSI-extend-easybuild.eb +++ b/EESSI-extend-easybuild.eb @@ -41,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 From 2d0200132950253b82d47c2c92db593bce136cdc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bob=20Dr=C3=B6ge?= Date: Fri, 6 Dec 2024 13:11:43 +0100 Subject: [PATCH 7/7] rebuild EESSI-extend --- .../2023.06/rebuilds/20241206-eb-4.9.4-EESSI-extend.yml | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 easystacks/software.eessi.io/2023.06/rebuilds/20241206-eb-4.9.4-EESSI-extend.yml 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 new file mode 100644 index 0000000000..04a60f595c --- /dev/null +++ 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