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

[Andreas K. Hüttel]

commit:     799a9897e0b0fb55db142a9e56ad254f8242e9b9
Author:     Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 22 22:11:43 2024 +0000
Commit:     Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Fri Mar 22 22:11:43 2024 +0000
URL:        https://gitweb.gentoo.org/proj/releng.git/commit/?id=799a9897

Upload 23.0 stages for m68k

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

 tools/catalyst-auto-qemu-m68k.conf | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

diff --git a/tools/catalyst-auto-qemu-m68k.conf 
b/tools/catalyst-auto-qemu-m68k.conf
index 86d21356..a33c3ca9 100644
--- a/tools/catalyst-auto-qemu-m68k.conf
+++ b/tools/catalyst-auto-qemu-m68k.conf
@@ -15,14 +15,11 @@ SETS="
        systemd_23
        musl_23
        openrc
-       systemd_mu
        musl
 "
 
 SET_openrc_SPECS="stage1-openrc.spec stage3-openrc.spec"
 
-SET_systemd_mu_SPECS="stage1-systemd-mu.spec stage3-systemd-mu.spec"
-
 SET_musl_SPECS="stage1-musl.spec stage3-musl.spec"
 
 SET_openrc_23_SPECS="stage1-openrc-23.spec stage3-openrc-23.spec"
@@ -51,28 +48,28 @@ post_build() {
        case ${spec} in
                stage3-openrc.spec)
                        pushd "${BUILD_SRCDIR_BASE}/builds/default" >/dev/null
-                       upload stage3-m68k-openrc-${TIMESTAMP}*.xz*
                        upsync_binpackages 
"${BUILD_SRCDIR_BASE}/packages/default/stage3-m68k" m68k/17.0/m68k
                        popd >/dev/null
                        ;;
-               stage3-systemd-mu.spec)
-                       pushd "${BUILD_SRCDIR_BASE}/builds/mergedusr" >/dev/null
-                       upload stage3-m68k-systemd-mergedusr-${TIMESTAMP}*.xz*
-                       popd >/dev/null
-                       ;;
                stage3-musl.spec)
                        pushd "${BUILD_SRCDIR_BASE}/builds/musl" >/dev/null
-                       upload stage3-m68k_musl-${TIMESTAMP}*.xz*
                        upsync_binpackages 
"${BUILD_SRCDIR_BASE}/packages/musl/stage3-m68k_musl" m68k/17.0/m68k_musl
                        popd >/dev/null
                        ;;
+               stage3-openrc-23.spec)
+                       pushd "${BUILD_SRCDIR_BASE}/builds/23.0-default" 
>/dev/null
+                       upload stage3-m68k-openrc-${TIMESTAMP}*.xz*
+                       popd >/dev/null
+                       ;;
                stage3-systemd-23.spec)
                        pushd "${BUILD_SRCDIR_BASE}/builds/23.0-default" 
>/dev/null
+                       upload stage3-m68k-systemd-${TIMESTAMP}*.xz*
                        upsync_binpackages 
"${BUILD_SRCDIR_BASE}/packages/23.0-default/stage3-m68k" m68k/23.0/m68k
                        popd >/dev/null
                        ;;
                stage3-musl-23.spec)
                        pushd "${BUILD_SRCDIR_BASE}/builds/23.0-musl" >/dev/null
+                       upload stage3-m68k_musl-${TIMESTAMP}*.xz*
                        upsync_binpackages 
"${BUILD_SRCDIR_BASE}/packages/23.0-musl/stage3-m68k_musl" m68k/23.0/m68k_musl
                        popd >/dev/null
                        ;;