From 69e393fc25835bac6d3cd1dc6ea73f1db6a7293f Mon Sep 17 00:00:00 2001 From: "Alexander, Michael" Date: Mon, 25 Nov 2024 13:03:31 -0500 Subject: [PATCH] Fix --skip-config-archive. The --skip-config-archive skips creating the tar.gz of the src/config. However the changes to how files are collected failed to check this before hardcoding that the output file should be collected. --- src/cmd-build | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/cmd-build b/src/cmd-build index 33769498ca..ac7df26259 100755 --- a/src/cmd-build +++ b/src/cmd-build @@ -633,7 +633,10 @@ loose_objs=() loose_objs+=("commitmeta.json" "ostree-commit-object") loose_objs+=("manifest-lock.generated.$basearch.json") # source metadata -loose_objs+=("coreos-assembler-config-git.json" "coreos-assembler-config.tar.gz") +loose_objs+=("coreos-assembler-config-git.json") +if [ "${CONFIG_ARCHIVE}" != 0 ]; then + loose_objs+=("coreos-assembler-config.tar.gz") +fi mv -vt "${builddir}" "${loose_objs[@]}" # official more public artifacts; tracked by meta.json jq -r .images[].path meta.json | xargs mv -vt "${builddir}"