Skip to content
Snippets Groups Projects
Commit 551ec623 authored by Philipp Spilger's avatar Philipp Spilger
Browse files

chore: Move visionary-dev-tools spec out of commons.sh

Change-Id: I5f547f0c7b8ae5f4cbd4ed0b6890528ac023ccd0
parent 511c4d0f
No related branches found
No related tags found
No related merge requests found
...@@ -170,9 +170,6 @@ fi ...@@ -170,9 +170,6 @@ fi
# PACKAGES # # 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 # used in VIEWS section below but needs to be defined before sourcing
# associative array: spec to add -> view names seperated by spaces # associative array: spec to add -> view names seperated by spaces
declare -A spack_add_to_view declare -A spack_add_to_view
......
# All spack packages that should be fetched/installed in the container # All spack packages that should be fetched/installed in the container
spack_packages=( spack_packages=(
# "${SPEC_VIEW_VISIONARY_DEV_TOOLS}" # FIXME # "visionary-dev-tools ^${DEPENDENCY_PYTHON} %${YASHCHIKI_SPACK_GCC}" # FIXME
"visionary-asic ^${DEPENDENCY_PYTHON} %${YASHCHIKI_SPACK_GCC}" "visionary-asic ^${DEPENDENCY_PYTHON} %${YASHCHIKI_SPACK_GCC}"
) )
......
# All spack packages that should be fetched/installed in the container # All spack packages that should be fetched/installed in the container
spack_packages=( spack_packages=(
"${SPEC_VIEW_VISIONARY_DEV_TOOLS}" "visionary-dev-tools ^${DEPENDENCY_PYTHON} %${YASHCHIKI_SPACK_GCC}"
# START python 3 packages # START python 3 packages
"visionary-wafer~dev ^${DEPENDENCY_PYTHON} %${YASHCHIKI_SPACK_GCC}" "visionary-wafer~dev ^${DEPENDENCY_PYTHON} %${YASHCHIKI_SPACK_GCC}"
"visionary-wafer ^${DEPENDENCY_PYTHON} %${YASHCHIKI_SPACK_GCC}" "visionary-wafer ^${DEPENDENCY_PYTHON} %${YASHCHIKI_SPACK_GCC}"
......
...@@ -22,5 +22,5 @@ ${MY_SPACK_BIN} ${SPACK_ARGS_VIEW[@]+"${SPACK_ARGS_VIEW[@]}"} view -d yes symlin ...@@ -22,5 +22,5 @@ ${MY_SPACK_BIN} ${SPACK_ARGS_VIEW[@]+"${SPACK_ARGS_VIEW[@]}"} view -d yes symlin
# dev tools # # 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 EOF
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment