From 06f88dbbc5f90654fb1d48c888a9575cb768be59 Mon Sep 17 00:00:00 2001
From: Kenneth Hoste <kenneth.hoste@ugent.be>
Date: Tue, 7 May 2024 18:15:55 +0200
Subject: [PATCH 1/2] stick to x86_64/amd/zen3 when AMD Genoa (Zen4) is
 detected, until optimized software installations are available for Zen4

---
 init/eessi_environment_variables | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/init/eessi_environment_variables b/init/eessi_environment_variables
index 5450b2bfb4..e7f8f2faaa 100644
--- a/init/eessi_environment_variables
+++ b/init/eessi_environment_variables
@@ -48,6 +48,14 @@ if [ -d $EESSI_PREFIX ]; then
     fi
     if [ ! -z $EESSI_SOFTWARE_SUBDIR ]; then
 
+        # use x86_64/amd/zen3 for now when AMD Genoa (Zen4) CPU is detected,
+        # since optimized software installations for Zen4 are a work-in-progress,
+        # see https://gitlab.com/eessi/support/-/issues/37
+        if [[ "${EESSI_SOFTWARE_SUBDIR}" == "x86_64/amd/zen4" ]]; then
+            export EESSI_SOFTWARE_SUBDIR="x86_64/amd/zen3"
+            echo -e "\e[33mSticking to ${EESSI_SOFTWARE_SUBDIR} for now, since optimized installations for AMD Genoa (Zen4) are a work in progress, see https://gitlab.com/eessi/support/-/issues/37 for more information\e[0m"
+        fi
+
         show_msg "Using ${EESSI_SOFTWARE_SUBDIR} as software subdirectory."
         export EESSI_SOFTWARE_PATH=$EESSI_PREFIX/software/$EESSI_OS_TYPE/$EESSI_SOFTWARE_SUBDIR
 

From 8cce17c83ba3230774a56de285de3fe369792595 Mon Sep 17 00:00:00 2001
From: Kenneth Hoste <kenneth.hoste@ugent.be>
Date: Tue, 7 May 2024 19:19:54 +0200
Subject: [PATCH 2/2] relax check for existence of software overlay dir in
 script to create tarball to deploy

---
 create_tarball.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/create_tarball.sh b/create_tarball.sh
index 2d77acfc43..0a7669f73f 100755
--- a/create_tarball.sh
+++ b/create_tarball.sh
@@ -28,7 +28,7 @@ fi
 
 overlay_upper_dir="${eessi_tmpdir}/overlay-upper"
 
-software_dir_overlay="${overlay_upper_dir}/versions/${eessi_version}/software/${os}/${cpu_arch_subdir}"
+software_dir_overlay="${overlay_upper_dir}/versions/${eessi_version}"
 if [ ! -d ${software_dir_overlay} ]; then
     echo "Software directory overlay ${software_dir_overlay} does not exist?!" >&2
     exit 3