From e5446be6f63aa6eb997049cae626871721467462 Mon Sep 17 00:00:00 2001
From: Kenneth Hoste <kenneth.hoste@ugent.be>
Date: Fri, 13 Jun 2025 11:13:33 +0200
Subject: [PATCH 1/2] make sure that EESSI version for which build is triggered
 matches with location of easystack file

---
 EESSI-install-software.sh | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/EESSI-install-software.sh b/EESSI-install-software.sh
index 60613fed..bf27492a 100755
--- a/EESSI-install-software.sh
+++ b/EESSI-install-software.sh
@@ -358,6 +358,12 @@ else
     new_easystacks=$(echo "${changed_easystacks}" | (grep -v "/rebuilds/" || true))
     for easystack_file in ${rebuild_easystacks} ${new_easystacks}; do
 
+        # make sure that easystack file being picked up is for EESSI version that we're building for...
+        echo "${easystack_file}" | grep -q "^easystacks/${EESSI_VERSION}/"
+        if [ $? -ne 0 ]; then
+            fatal_error "Easystack file ${easystack_file} is not intended for EESSI version ${EESSI_VERSION}, giving up!"
+        fi
+
         echo -e "Processing easystack file ${easystack_file}...\n\n"
 
         # determine version of EasyBuild module to load based on EasyBuild version included in name of easystack file

From 19efe9e2c3ce5558a8b6768141f91f676f1674af Mon Sep 17 00:00:00 2001
From: Kenneth Hoste <kenneth.hoste@ugent.be>
Date: Fri, 13 Jun 2025 11:32:00 +0200
Subject: [PATCH 2/2] fix URL used in create_directory_tarballs.sh, should be
 EESSI/software-layer-scripts repo

---
 create_directory_tarballs.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/create_directory_tarballs.sh b/create_directory_tarballs.sh
index 0270719a..5ebdc16b 100755
--- a/create_directory_tarballs.sh
+++ b/create_directory_tarballs.sh
@@ -9,7 +9,7 @@ fi
 
 version=$1
 
-SOFTWARE_LAYER_TARBALL_URL="https://github.com/EESSI/software-layer/tarball/${version}-software.eessi.io"
+SOFTWARE_LAYER_SCRIPTS_TARBALL_URL="https://github.com/EESSI/software-layer-scripts/tarball/main"
 
 TOPDIR=$(dirname $(realpath $0))
 
@@ -26,7 +26,7 @@ fi
 tartmp=$(mktemp -t -d init.XXXXX)
 mkdir "${tartmp}/${version}"
 tarname="eessi-${version}-init-$(date +%s).tar.gz"
-curl -Ls ${SOFTWARE_LAYER_TARBALL_URL} | tar xzf - -C "${tartmp}/${version}" --strip-components=1 --no-wildcards-match-slash --wildcards '*/init/'
+curl -Ls ${SOFTWARE_LAYER_SCRIPTS_TARBALL_URL} | tar xzf - -C "${tartmp}/${version}" --strip-components=1 --no-wildcards-match-slash --wildcards '*/init/'
 source "${tartmp}/${version}/init/minimal_eessi_env"
 if [ "${EESSI_VERSION}" != "${version}" ]
 then
@@ -42,7 +42,7 @@ echo_green "Done! Created tarball ${tarname}."
 tartmp=$(mktemp -t -d scripts.XXXXX)
 mkdir "${tartmp}/${version}"
 tarname="eessi-${version}-scripts-$(date +%s).tar.gz"
-curl -Ls ${SOFTWARE_LAYER_TARBALL_URL} | tar xzf - -C "${tartmp}/${version}" --strip-components=1 --no-wildcards-match-slash --wildcards '*/scripts/'
+curl -Ls ${SOFTWARE_LAYER_SCRIPTS_TARBALL_URL} | tar xzf - -C "${tartmp}/${version}" --strip-components=1 --no-wildcards-match-slash --wildcards '*/scripts/'
 tar czf "${tarname}" -C "${tartmp}" "${version}"
 rm -rf "${tartmp}"