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

[Andreas K. Hüttel]

commit:     73b527f09bc993037cae0b480e8a19a78dfeda7d
Author:     Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 23 14:16:15 2024 +0000
Commit:     Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sat Mar 23 14:16:15 2024 +0000
URL:        https://gitweb.gentoo.org/proj/releng.git/commit/?id=73b527f0

Upload 23.0 stages for sparc

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

 tools/catalyst-auto-sparc64.conf | 25 ++++++++-----------------
 1 file changed, 8 insertions(+), 17 deletions(-)

diff --git a/tools/catalyst-auto-sparc64.conf b/tools/catalyst-auto-sparc64.conf
index 34b7553d..d094f457 100644
--- a/tools/catalyst-auto-sparc64.conf
+++ b/tools/catalyst-auto-sparc64.conf
@@ -11,17 +11,13 @@ SETS="
        openrc_64_23
        systemd_64_23
        openrc_32
-       systemd_32_mu
        openrc_64
-       systemd_64_mu
 "
 
 SET_openrc_32_SPECS="sparc/stage1.spec sparc/stage3.spec"
-SET_systemd_32_mu_SPECS="sparc/systemd-stage1-mu.spec 
sparc/systemd-stage3-mu.spec"
 
 SET_openrc_64_SPECS="sparc64/stage1.spec sparc64/stage3.spec"
 SET_openrc_64_OPTIONAL_SPECS="sparc64/installcd-stage1.spec 
sparc64/installcd-stage2-minimal.spec"
-SET_systemd_64_mu_SPECS="sparc64/systemd-stage1-mu.spec 
sparc64/systemd-stage3-mu.spec"
 
 SET_openrc_32_23_SPECS="sparc/stage1-openrc-23.spec 
sparc/stage3-openrc-23.spec"
 SET_systemd_32_23_SPECS="sparc/stage1-systemd-23.spec 
sparc/stage3-systemd-23.spec"
@@ -61,11 +57,9 @@ post_build() {
                upload *${TIMESTAMP}*.iso*
                ;;
        sparc/stage3.spec)
-               upload stage3-sparc-${TIMESTAMP}*.xz*
                upsync_binpackages 
"${BUILD_SRCDIR_BASE}/packages/default/stage3-sparc" sparc/17.0/32
                ;;
        sparc64/stage3.spec)
-               upload stage3-sparc64-${TIMESTAMP}*.xz*
                upsync_binpackages 
"${BUILD_SRCDIR_BASE}/packages/default/stage3-sparc64" sparc/17.0/64
                ;;
        esac
@@ -73,23 +67,20 @@ post_build() {
 
        pushd "${BUILD_SRCDIR_BASE}/builds/23.0-default" >/dev/null
        case ${spec} in
+       sparc/stage3-openrc-23.spec)
+               upload stage3-sparc-openrc-${TIMESTAMP}*.xz*
+               ;;
        sparc/stage3-systemd-23.spec)
+               upload stage3-sparc-systemd-${TIMESTAMP}*.xz*
                upsync_binpackages 
"${BUILD_SRCDIR_BASE}/packages/23.0-default/stage3-sparc" sparc/23.0/32
                ;;
+       sparc64/stage3-openrc-23.spec)
+               upload stage3-sparc64-openrc-${TIMESTAMP}*.xz*
+               ;;
        sparc64/stage3-systemd-23.spec)
+               upload stage3-sparc64-systemd-${TIMESTAMP}*.xz*
                upsync_binpackages 
"${BUILD_SRCDIR_BASE}/packages/23.0-default/stage3-sparc64" sparc/23.0/64
                ;;
        esac
        popd >/dev/null
-
-       pushd "${BUILD_SRCDIR_BASE}/builds/mergedusr" >/dev/null
-       case ${spec} in
-       sparc/systemd-stage3-mu.spec)
-               upload stage3-sparc-systemd-mergedusr-${TIMESTAMP}*.xz*
-               ;;
-       sparc64/systemd-stage3-mu.spec)
-               upload stage3-sparc64-systemd-mergedusr-${TIMESTAMP}*.xz*
-               ;;
-       esac
-       popd >/dev/null
 }