From 551ec62384f9aad14d5f9b8eeacf394636eb7131 Mon Sep 17 00:00:00 2001
From: Philipp Spilger <philipp.spilger@kip.uni-heidelberg.de>
Date: Fri, 9 Feb 2024 13:20:08 +0100
Subject: [PATCH] chore: Move visionary-dev-tools spec out of commons.sh
Change-Id: I5f547f0c7b8ae5f4cbd4ed0b6890528ac023ccd0
---
lib/yashchiki/commons.sh | 3 ---
share/yashchiki/styles/asic/spack_collection.sh | 2 +-
share/yashchiki/styles/visionary/spack_collection.sh | 2 +-
share/yashchiki/styles/visionary/spack_custom_view.sh | 2 +-
4 files changed, 3 insertions(+), 6 deletions(-)
diff --git a/lib/yashchiki/commons.sh b/lib/yashchiki/commons.sh
index 5afdceaf..b0816fbb 100755
--- a/lib/yashchiki/commons.sh
+++ b/lib/yashchiki/commons.sh
@@ -170,9 +170,6 @@ fi
# PACKAGES #
############
-# the version of dev tools we want in our view
-SPEC_VIEW_VISIONARY_DEV_TOOLS="visionary-dev-tools ^${DEPENDENCY_PYTHON} %${YASHCHIKI_SPACK_GCC}"
-
# used in VIEWS section below but needs to be defined before sourcing
# associative array: spec to add -> view names seperated by spaces
declare -A spack_add_to_view
diff --git a/share/yashchiki/styles/asic/spack_collection.sh b/share/yashchiki/styles/asic/spack_collection.sh
index be74a8e2..de331796 100644
--- a/share/yashchiki/styles/asic/spack_collection.sh
+++ b/share/yashchiki/styles/asic/spack_collection.sh
@@ -1,6 +1,6 @@
# All spack packages that should be fetched/installed in the container
spack_packages=(
-# "${SPEC_VIEW_VISIONARY_DEV_TOOLS}" # FIXME
+# "visionary-dev-tools ^${DEPENDENCY_PYTHON} %${YASHCHIKI_SPACK_GCC}" # FIXME
"visionary-asic ^${DEPENDENCY_PYTHON} %${YASHCHIKI_SPACK_GCC}"
)
diff --git a/share/yashchiki/styles/visionary/spack_collection.sh b/share/yashchiki/styles/visionary/spack_collection.sh
index 462b9133..bd7b9054 100644
--- a/share/yashchiki/styles/visionary/spack_collection.sh
+++ b/share/yashchiki/styles/visionary/spack_collection.sh
@@ -1,6 +1,6 @@
# All spack packages that should be fetched/installed in the container
spack_packages=(
- "${SPEC_VIEW_VISIONARY_DEV_TOOLS}"
+ "visionary-dev-tools ^${DEPENDENCY_PYTHON} %${YASHCHIKI_SPACK_GCC}"
# START python 3 packages
"visionary-wafer~dev ^${DEPENDENCY_PYTHON} %${YASHCHIKI_SPACK_GCC}"
"visionary-wafer ^${DEPENDENCY_PYTHON} %${YASHCHIKI_SPACK_GCC}"
diff --git a/share/yashchiki/styles/visionary/spack_custom_view.sh b/share/yashchiki/styles/visionary/spack_custom_view.sh
index 82c70d15..68c2764b 100644
--- a/share/yashchiki/styles/visionary/spack_custom_view.sh
+++ b/share/yashchiki/styles/visionary/spack_custom_view.sh
@@ -22,5 +22,5 @@ ${MY_SPACK_BIN} ${SPACK_ARGS_VIEW[@]+"${SPACK_ARGS_VIEW[@]}"} view -d yes symlin
# dev tools #
#############
-${MY_SPACK_BIN} ${SPACK_ARGS_VIEW[@]+"${SPACK_ARGS_VIEW[@]}"} view -d yes symlink -i ${MY_SPACK_VIEW_PREFIX}/visionary-dev-tools $(get_latest_hash "${SPEC_VIEW_VISIONARY_DEV_TOOLS}")
+${MY_SPACK_BIN} ${SPACK_ARGS_VIEW[@]+"${SPACK_ARGS_VIEW[@]}"} view -d yes symlink -i ${MY_SPACK_VIEW_PREFIX}/visionary-dev-tools $(get_latest_hash "visionary-dev-tools ^${DEPENDENCY_PYTHON} %${YASHCHIKI_SPACK_GCC}")
EOF
--
GitLab