Skip to content

Commit 72a278e

Browse files
authored
Add packages.yaml dependency for upstreams.yaml in Makefile (#296)
The `all` target executes upstreams.yaml dependency first but it does not ensure that $(CONFIG_DIR) exists. This fix is required for successful execution on Rocky 10 using Spack v1.1.0.
1 parent 41b4b8a commit 72a278e

1 file changed

Lines changed: 2 additions & 1 deletion

File tree

stackinator/templates/Makefile.generate-config

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,8 @@ COMPILER_PREFIXES ={% for compiler in release_compilers %} $$($(SPACK_HELPER) -e
1313
all: $(CONFIG_DIR)/upstreams.yaml $(CONFIG_DIR)/packages.yaml $(CONFIG_DIR)/repos.yaml{% if modules %} $(MODULE_DIR)/upstreams.yaml $(MODULE_DIR)/compilers.yaml{% endif %}
1414

1515
# Generate the upstream configuration that will be provided by the mounted image
16-
$(CONFIG_DIR)/upstreams.yaml:
16+
# (requires packages.yaml to ensure that the path $(CONFIG_DIR) has been created).
17+
$(CONFIG_DIR)/upstreams.yaml: $(CONFIG_DIR)/packages.yaml
1718
$(SPACK) config --scope=user add upstreams:system:install_tree:$(STORE)
1819

1920
# Copy the cluster-specific packages.yaml file to the configuration.

0 commit comments

Comments
 (0)