From e62cc910feabceb95faa597a78829ca635be4d67 Mon Sep 17 00:00:00 2001 From: Fabian Wermelinger Date: Thu, 4 Jun 2026 11:10:10 +0200 Subject: [PATCH] Add packages.yaml dependency for upstreams.yaml in Makefile 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. --- stackinator/templates/Makefile.generate-config | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/stackinator/templates/Makefile.generate-config b/stackinator/templates/Makefile.generate-config index a53a1c8c..1750f037 100644 --- a/stackinator/templates/Makefile.generate-config +++ b/stackinator/templates/Makefile.generate-config @@ -13,7 +13,8 @@ COMPILER_PREFIXES ={% for compiler in release_compilers %} $$($(SPACK_HELPER) -e all: $(CONFIG_DIR)/upstreams.yaml $(CONFIG_DIR)/packages.yaml $(CONFIG_DIR)/repos.yaml{% if modules %} $(MODULE_DIR)/upstreams.yaml $(MODULE_DIR)/compilers.yaml{% endif %} # Generate the upstream configuration that will be provided by the mounted image -$(CONFIG_DIR)/upstreams.yaml: +# (requires packages.yaml to ensure that the path $(CONFIG_DIR) has been created). +$(CONFIG_DIR)/upstreams.yaml: $(CONFIG_DIR)/packages.yaml $(SPACK) config --scope=user add upstreams:system:install_tree:$(STORE) # Copy the cluster-specific packages.yaml file to the configuration.