From bf734239dbaa49231fd9082dc40dd32795c7bced Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20K=2E=20H=C3=BCttel?= Date: Thu, 8 Jul 2021 10:25:45 +0200 Subject: [PATCH] amd64: make flat upload directory, no subdirs MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Andreas K. Hüttel --- tools/catalyst-auto-amd64-demeter.conf | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/tools/catalyst-auto-amd64-demeter.conf b/tools/catalyst-auto-amd64-demeter.conf index 8f462ad9..ec8a2ae3 100644 --- a/tools/catalyst-auto-amd64-demeter.conf +++ b/tools/catalyst-auto-amd64-demeter.conf @@ -50,8 +50,9 @@ update_symlinks() { post_build() { local set=$1 spec=$2 + UPLOAD_DEST=${BUILD_DESTDIR_BASE} + pushd "${BUILD_SRCDIR_BASE}"/builds/default >/dev/null || exit - UPLOAD_DEST=${BUILD_DESTDIR_BASE}/x32 case ${spec} in x32/stage3-openrc.spec) upload stage3-x32-openrc-${TIMESTAMP}.tar.xz* @@ -60,7 +61,6 @@ post_build() { popd >/dev/null || exit pushd "${BUILD_SRCDIR_BASE}"/builds/musl >/dev/null || exit - UPLOAD_DEST=${BUILD_DESTDIR_BASE}/musl case ${spec} in musl/stage3.spec) upload stage3-amd64-musl-${TIMESTAMP}.tar.xz* @@ -69,7 +69,6 @@ post_build() { popd >/dev/null || exit pushd "${BUILD_SRCDIR_BASE}"/builds/musl-hardened >/dev/null || exit - UPLOAD_DEST=${BUILD_DESTDIR_BASE}/musl case ${spec} in musl/stage3-hardened.spec) upload stage3-amd64-musl-hardened-${TIMESTAMP}.tar.xz*