From 107cdabf58085eebf7a61579beddf3e20a376810 Mon Sep 17 00:00:00 2001
From: Caspar van Leeuwen <casparl@tcn96.local.snellius.surf.nl>
Date: Wed, 9 Jul 2025 13:57:04 +0200
Subject: [PATCH 1/5] Change EESSI_TARGET_ACCELERATOR into
 EESSI_TARGET_ACCELERATOR_OVERRIDE, since the first isn't set anymore

---
 bot/build.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/bot/build.sh b/bot/build.sh
index 24549a2a..11b8ec41 100755
--- a/bot/build.sh
+++ b/bot/build.sh
@@ -298,8 +298,8 @@ export EESSI_DEV_PROJECT=${EESSI_DEV_PROJECT}
 TMP_IN_CONTAINER=/tmp
 echo "Executing command to create tarball:"
 echo "$software_layer_dir/eessi_container.sh ${COMMON_ARGS[@]} ${TARBALL_STEP_ARGS[@]}"
-echo "                     -- $software_layer_dir/create_tarball.sh ${TMP_IN_CONTAINER} ${EESSI_VERSION} ${EESSI_SOFTWARE_SUBDIR_OVERRIDE} \"${EESSI_ACCELERATOR_TARGET}\" /eessi_bot_job/${TGZ} 2>&1 | tee -a ${tar_outerr}"
+echo "                     -- $software_layer_dir/create_tarball.sh ${TMP_IN_CONTAINER} ${EESSI_VERSION} ${EESSI_SOFTWARE_SUBDIR_OVERRIDE} \"${EESSI_ACCELERATOR_TARGET_OVERRIDE}\" /eessi_bot_job/${TGZ} 2>&1 | tee -a ${tar_outerr}"
 $software_layer_dir/eessi_container.sh "${COMMON_ARGS[@]}" "${TARBALL_STEP_ARGS[@]}" \
-                     -- $software_layer_dir/create_tarball.sh ${TMP_IN_CONTAINER} ${EESSI_VERSION} ${EESSI_SOFTWARE_SUBDIR_OVERRIDE} "${EESSI_ACCELERATOR_TARGET}" /eessi_bot_job/${TGZ} 2>&1 | tee -a ${tar_outerr}
+                     -- $software_layer_dir/create_tarball.sh ${TMP_IN_CONTAINER} ${EESSI_VERSION} ${EESSI_SOFTWARE_SUBDIR_OVERRIDE} "${EESSI_ACCELERATOR_TARGET_OVERRIDE}" /eessi_bot_job/${TGZ} 2>&1 | tee -a ${tar_outerr}
 
 exit 0

From 831305b7658fe40462a5e1af1b3ef0e5d1c89a9b Mon Sep 17 00:00:00 2001
From: Caspar van Leeuwen <casparl@tcn96.local.snellius.surf.nl>
Date: Wed, 9 Jul 2025 14:05:32 +0200
Subject: [PATCH 2/5] Conditionally add the accelerator path, only if it's
 non-empty

---
 create_tarball.sh | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/create_tarball.sh b/create_tarball.sh
index 2fe15531..ff465ccf 100755
--- a/create_tarball.sh
+++ b/create_tarball.sh
@@ -62,8 +62,12 @@ if [ -d ${eessi_version}/init ]; then
     find ${eessi_version}/init -type f \! -name '.wh.*' >> ${files_list}
 fi
 
-# consider both CPU-only and accelerator subdirectories
-for subdir in ${cpu_arch_subdir} ${cpu_arch_subdir}/${accel_subdir}; do
+# consider both CPU-only and accelerator subdirectories (if an accelerator was configured)
+sw_subdirs=${cpu_arch_subdir}
+if [ -n ${accel_subdir} ]; then
+    sw_subdirs="${sw_subdirs} ${cpu_arch_subdir}/${accel_subdir}"
+fi
+for subdir in ${sw_subdirs}; do
 
     if [ -d ${eessi_version}/software/${os}/${subdir}/modules ]; then
         # module files

From 91696d15de62b87cabb8eb4bce30ecadd2bb7239 Mon Sep 17 00:00:00 2001
From: Caspar van Leeuwen <casparl@tcn96.local.snellius.surf.nl>
Date: Wed, 9 Jul 2025 14:07:17 +0200
Subject: [PATCH 3/5] Add easystack for testing

---
 .../nvidia/zen4_h100/eessi-2023.06-eb-4.9.4-2023a-CUDA.yml   | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 easystacks/software.eessi.io/2023.06/accel/nvidia/zen4_h100/eessi-2023.06-eb-4.9.4-2023a-CUDA.yml

diff --git a/easystacks/software.eessi.io/2023.06/accel/nvidia/zen4_h100/eessi-2023.06-eb-4.9.4-2023a-CUDA.yml b/easystacks/software.eessi.io/2023.06/accel/nvidia/zen4_h100/eessi-2023.06-eb-4.9.4-2023a-CUDA.yml
new file mode 100644
index 00000000..815422ee
--- /dev/null
+++ b/easystacks/software.eessi.io/2023.06/accel/nvidia/zen4_h100/eessi-2023.06-eb-4.9.4-2023a-CUDA.yml
@@ -0,0 +1,5 @@
+easyconfigs:
+  - CUDA-12.1.1.eb:
+    options:
+      accept-eula-for: CUDA
+  - pmt-1.2.0-GCCcore-12.3.0-CUDA-12.1.1.eb:

From a84cfd8bd99396a27b1263953443fb1430112028 Mon Sep 17 00:00:00 2001
From: Caspar van Leeuwen <casparl@tcn96.local.snellius.surf.nl>
Date: Wed, 9 Jul 2025 14:22:05 +0200
Subject: [PATCH 4/5] Fix indentation

---
 .../nvidia/zen4_h100/eessi-2023.06-eb-4.9.4-2023a-CUDA.yml    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/easystacks/software.eessi.io/2023.06/accel/nvidia/zen4_h100/eessi-2023.06-eb-4.9.4-2023a-CUDA.yml b/easystacks/software.eessi.io/2023.06/accel/nvidia/zen4_h100/eessi-2023.06-eb-4.9.4-2023a-CUDA.yml
index 815422ee..a80a4903 100644
--- a/easystacks/software.eessi.io/2023.06/accel/nvidia/zen4_h100/eessi-2023.06-eb-4.9.4-2023a-CUDA.yml
+++ b/easystacks/software.eessi.io/2023.06/accel/nvidia/zen4_h100/eessi-2023.06-eb-4.9.4-2023a-CUDA.yml
@@ -1,5 +1,5 @@
 easyconfigs:
   - CUDA-12.1.1.eb:
-    options:
-      accept-eula-for: CUDA
+      options:
+        accept-eula-for: CUDA
   - pmt-1.2.0-GCCcore-12.3.0-CUDA-12.1.1.eb:

From 2d0cc6861ddc2607125e574d1b114672cc87d0d8 Mon Sep 17 00:00:00 2001
From: Caspar van Leeuwen <casparl@tcn96.local.snellius.surf.nl>
Date: Wed, 9 Jul 2025 14:29:33 +0200
Subject: [PATCH 5/5] Remove test easystack

---
 .../nvidia/zen4_h100/eessi-2023.06-eb-4.9.4-2023a-CUDA.yml   | 5 -----
 1 file changed, 5 deletions(-)
 delete mode 100644 easystacks/software.eessi.io/2023.06/accel/nvidia/zen4_h100/eessi-2023.06-eb-4.9.4-2023a-CUDA.yml

diff --git a/easystacks/software.eessi.io/2023.06/accel/nvidia/zen4_h100/eessi-2023.06-eb-4.9.4-2023a-CUDA.yml b/easystacks/software.eessi.io/2023.06/accel/nvidia/zen4_h100/eessi-2023.06-eb-4.9.4-2023a-CUDA.yml
deleted file mode 100644
index a80a4903..00000000
--- a/easystacks/software.eessi.io/2023.06/accel/nvidia/zen4_h100/eessi-2023.06-eb-4.9.4-2023a-CUDA.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-easyconfigs:
-  - CUDA-12.1.1.eb:
-      options:
-        accept-eula-for: CUDA
-  - pmt-1.2.0-GCCcore-12.3.0-CUDA-12.1.1.eb: