[gentoo-commits] proj/releng:master commit in: tools/

[Andreas K. Hüttel]

commit:     bf734239dbaa49231fd9082dc40dd32795c7bced
Author:     Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Thu Jul  8 08:25:45 2021 +0000
Commit:     Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Thu Jul  8 08:25:45 2021 +0000
URL:        https://gitweb.gentoo.org/proj/releng.git/commit/?id=bf734239

amd64: make flat upload directory, no subdirs

Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>

 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*