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

[Matt Turner]

commit:     af8ffec8e7544afce734cb6c3a0e4db2be539a6d
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 15 23:18:38 2020 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Tue Dec 15 23:29:20 2020 +0000
URL:        https://gitweb.gentoo.org/proj/releng.git/commit/?id=af8ffec8

tools/ppc64le: Handle musl-hardened/ directory

Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 tools/catalyst-auto-ppc64le.conf | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/tools/catalyst-auto-ppc64le.conf b/tools/catalyst-auto-ppc64le.conf
index 2379954a..73f2d1c3 100644
--- a/tools/catalyst-auto-ppc64le.conf
+++ b/tools/catalyst-auto-ppc64le.conf
@@ -20,7 +20,7 @@ EMAIL_SUBJECT_PREPEND="[ppc64le-auto]"
 update_symlinks() {
        # Symlink the latest stages3 to build from
        local d f t
-       for d in "${BUILD_SRCDIR_BASE}/builds/default" ; do
+       for d in "${BUILD_SRCDIR_BASE}/builds/default" 
"${BUILD_SRCDIR_BASE}/builds/musl-hardened"; do
                pushd "${d}" >/dev/null
                for t in ppc64le; do
                        for f in $(ls stage3-${t}-*xz | grep -v latest | 
give_latest_from_dates) ; do
@@ -39,20 +39,20 @@ upload() {
 post_build() {
        local set=$1 spec=$2
 
-       pushd "${BUILD_SRCDIR_BASE}/builds/default" >/dev/null
+       pushd "${BUILD_SRCDIR_BASE}/builds" >/dev/null
 
        case ${spec} in
        installcd-stage2-minimal.spec)
-               upload *${TIMESTAMP}*.iso*
+               upload default/*${TIMESTAMP}*.iso*
                ;;
        stage3*.spec)
-               upload stage3-ppc64le-${TIMESTAMP}*.xz*
+               upload default/stage3-ppc64le-${TIMESTAMP}*.xz*
                ;;
        systemd-stage3*.spec)
-               upload stage3-ppc64le-systemd-${TIMESTAMP}*.xz*
+               upload default/stage3-ppc64le-systemd-${TIMESTAMP}*.xz*
                ;;
        musl-hardened-stage3*.spec)
-               upload stage3-ppc64le-musl-hardened-${TIMESTAMP}*.xz*
+               upload 
musl-hardened/stage3-ppc64le-musl-hardened-${TIMESTAMP}*.xz*
                ;;
        esac