From f3b9099bb1260b4d8b23458e3fbaad9adf919589 Mon Sep 17 00:00:00 2001 From: Zac Mrowicki Date: Mon, 28 Sep 2020 19:10:03 +0000 Subject: [PATCH] Store repos under repo name so you can build multiple Co-authored-by: Zac Mrowicki Co-authored-by: Tom Kirchner --- Makefile.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile.toml b/Makefile.toml index 83b55495cc6..1ef2877bb49 100644 --- a/Makefile.toml +++ b/Makefile.toml @@ -89,7 +89,7 @@ BUILDSYS_NAME_VERSION="${BUILDSYS_NAME}-${BUILDSYS_VERSION_FULL}" BUILDSYS_NAME_FULL="${BUILDSYS_NAME_VARIANT}-${BUILDSYS_VERSION_FULL}" # Repo directories have subdirectories for variant/arch, so we only want version here. PUBLISH_REPO_BASE_DIR = "${BUILDSYS_BUILD_DIR}/repos" -PUBLISH_REPO_OUTPUT_DIR = "${PUBLISH_REPO_BASE_DIR}/${BUILDSYS_NAME_VERSION}" +PUBLISH_REPO_OUTPUT_DIR = "${PUBLISH_REPO_BASE_DIR}/${PUBLISH_REPO}/${BUILDSYS_NAME_VERSION}" # The default name of registered AMIs; override by setting PUBLISH_AMI_NAME. PUBLISH_AMI_NAME_DEFAULT = "${BUILDSYS_NAME}-${BUILDSYS_VARIANT}-${BUILDSYS_ARCH}-v${BUILDSYS_VERSION_IMAGE}-${BUILDSYS_VERSION_BUILD}" @@ -354,7 +354,7 @@ pubsys \ --signing-key "${PUBLISH_KEY}" \ --outdir "${PUBLISH_REPO_OUTPUT_DIR}" -ln -sfn "${PUBLISH_REPO_OUTPUT_DIR##*/}" "${PUBLISH_REPO_BASE_DIR}/latest" +ln -sfn "${PUBLISH_REPO_OUTPUT_DIR##*/}" "${PUBLISH_REPO_OUTPUT_DIR%/*}/latest" ''' ]