From a01a2ac61a3c0055f3b504ed0da39ca54bbf1104 Mon Sep 17 00:00:00 2001
From: Nicolas Richart <nicolas.richart@epfl.ch>
Date: Mon, 9 Sep 2024 19:00:44 +0200
Subject: [PATCH] Adding support for licenses
---
ci/setup_spack.sh | 20 +++++++++++++-------
stacks/pinot-noir/licenses/.to_keep | 0
2 files changed, 13 insertions(+), 7 deletions(-)
create mode 100644 stacks/pinot-noir/licenses/.to_keep
diff --git a/ci/setup_spack.sh b/ci/setup_spack.sh
index 236d562..77ed70d 100755
--- a/ci/setup_spack.sh
+++ b/ci/setup_spack.sh
@@ -58,10 +58,6 @@ cp ${STACK_CONFIG_PATH}/spack.yaml ${SPACK_SYSTEM_CONFIG_PATH}
replace_placholders ${SPACK_SYSTEM_CONFIG_PATH}/spack.yaml
-cp -r "${STACK_CONFIG_PATH}/templates" ${SPACK_SYSTEM_CONFIG_PATH}
-
-
-
for file in mirrors packages concretizer config definitions modules
do
for suffix in ${!file_mapping[@]}
@@ -78,12 +74,22 @@ do
done
done
-
-cat <<EOF > ${SPACK_SYSTEM_CONFIG_PATH}/config_stack.yaml
-config:
+echo "config:" > ${SPACK_SYSTEM_CONFIG_PATH}/config_stack.yaml
+if [ -d cp -r "${STACK_CONFIG_PATH}/templates" ${SPACK_SYSTEM_CONFIG_PATH} ]
+then
+ cp -r "${STACK_CONFIG_PATH}/templates" ${SPACK_SYSTEM_CONFIG_PATH}
+ cat <<EOF >> ${SPACK_SYSTEM_CONFIG_PATH}/config_stack.yaml
template_dirs:
- ${SPACK_SYSTEM_CONFIG_PATH}/templates
EOF
+fi
+
+if [ -d "${STACK_CONFIG_PATH}/licenses" ]
+then
+ cp -r "${STACK_CONFIG_PATH}/licenses" ${SPACK_SYSTEM_CONFIG_PATH}
+ echo " license_dir: ${SPACK_SYSTEM_CONFIG_PATH}/licenses" >> ${SPACK_SYSTEM_CONFIG_PATH}/config_stack.yaml
+fi
+
cat <<EOF > ${SPACK_SYSTEM_CONFIG_PATH}/modules_stack.yaml
modules:
diff --git a/stacks/pinot-noir/licenses/.to_keep b/stacks/pinot-noir/licenses/.to_keep
new file mode 100644
index 0000000..e69de29
--
GitLab