commit:     7114a9599ada20816a3095d7e2dfe9e0b698f9db
Author:     Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 22 22:08:06 2024 +0000
Commit:     Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Fri Mar 22 22:08:06 2024 +0000
URL:        https://gitweb.gentoo.org/proj/releng.git/commit/?id=7114a959

Upload 23.0 stages for arm64 (2)

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

 tools/catalyst-auto-qemu-arm64.conf | 16 ++++------------
 1 file changed, 4 insertions(+), 12 deletions(-)

diff --git a/tools/catalyst-auto-qemu-arm64.conf 
b/tools/catalyst-auto-qemu-arm64.conf
index 28ce8dba..2afa2c87 100644
--- a/tools/catalyst-auto-qemu-arm64.conf
+++ b/tools/catalyst-auto-qemu-arm64.conf
@@ -10,13 +10,10 @@ SETS="
        openrc_23
        systemd_23
        openrc
-       systemd_mu
 "
 
 SET_openrc_SPECS="stage1-openrc.spec stage3-openrc.spec"
 
-SET_systemd_mu_SPECS="stage1-systemd-mu.spec stage3-systemd-mu.spec"
-
 SET_openrc_23_SPECS="stage1-openrc-23.spec stage3-openrc-23.spec"
 
 SET_systemd_23_SPECS="stage1-systemd-23.spec stage3-systemd-23.spec"
@@ -46,23 +43,18 @@ post_build() {
        pushd "${BUILD_SRCDIR_BASE}/builds/default" >/dev/null
        case ${spec} in
        stage3-openrc.spec)
-               upload stage3-${SUBARCH}-openrc-${TIMESTAMP}*.xz*
                upsync_binpackages 
"${BUILD_SRCDIR_BASE}/packages/default/stage3-aarch64_be" arm64/17.0/aarch64_be
                ;;
        esac
        popd >/dev/null
 
-       pushd "${BUILD_SRCDIR_BASE}/builds/mergedusr" >/dev/null
-       case ${spec} in
-       stage3-systemd-mu.spec)
-               upload stage3-${SUBARCH}-systemd-mergedusr-${TIMESTAMP}*.xz*
-               ;;
-       esac
-       popd >/dev/null
-
        pushd "${BUILD_SRCDIR_BASE}/builds/23.0-default" >/dev/null
        case ${spec} in
+       stage3-openrc-23.spec)
+               upload stage3-${SUBARCH}-openrc-${TIMESTAMP}*.xz*
+               ;;
        stage3-systemd-23.spec)
+               upload stage3-${SUBARCH}-systemd-${TIMESTAMP}*.xz*
                upsync_binpackages 
"${BUILD_SRCDIR_BASE}/packages/23.0-default/stage3-aarch64_be" 
arm64/23.0/aarch64_be
                ;;
        esac

Reply via email to