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

[Andreas K. Hüttel]

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

Upload 23.0 stages for s390

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

 tools/catalyst-auto-s390.conf  | 16 ++++------------
 tools/catalyst-auto-s390x.conf | 16 ++++------------
 2 files changed, 8 insertions(+), 24 deletions(-)

diff --git a/tools/catalyst-auto-s390.conf b/tools/catalyst-auto-s390.conf
index e442ccac..8b9f1b3b 100644
--- a/tools/catalyst-auto-s390.conf
+++ b/tools/catalyst-auto-s390.conf
@@ -10,14 +10,11 @@ SETS="
        openrc_23
        systemd_23
        openrc
-       systemd_mu
 "
 
 SET_openrc_SPECS="stage1-openrc.spec stage3-openrc.spec"
 SET_openrc_OPTIONAL_SPECS="netboot/netboot.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"
@@ -51,23 +48,18 @@ post_build() {
                upload netboot-s390-${TIMESTAMP}/netboot*
                ;;
        stage3-openrc.spec)
-               upload stage3-${SUBARCH}-openrc-${TIMESTAMP}.tar.xz*
                upsync_binpackages 
"${BUILD_SRCDIR_BASE}/packages/default/stage3-s390" s390/17.0/s390
                ;;
        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}.tar.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}.tar.xz*
+               ;;
        stage3-systemd-23.spec)
+               upload stage3-${SUBARCH}-systemd-${TIMESTAMP}.tar.xz*
                upsync_binpackages 
"${BUILD_SRCDIR_BASE}/packages/23.0-default/stage3-s390" s390/23.0/s390
                ;;
        esac

diff --git a/tools/catalyst-auto-s390x.conf b/tools/catalyst-auto-s390x.conf
index 99c5c3ef..3bc474b9 100644
--- a/tools/catalyst-auto-s390x.conf
+++ b/tools/catalyst-auto-s390x.conf
@@ -10,14 +10,11 @@ SETS="
        openrc_23
        systemd_23
        openrc
-       systemd_mu
 "
 
 SET_openrc_SPECS="stage1-openrc.spec stage3-openrc.spec"
 SET_openrc_OPTIONAL_SPECS="netboot/netboot.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"
@@ -51,7 +48,6 @@ post_build() {
                upload netboot-s390x-${TIMESTAMP}/netboot*
                ;;
        stage3-openrc.spec)
-               upload stage3-${SUBARCH}-openrc-${TIMESTAMP}.tar.xz*
                upsync_binpackages 
"${BUILD_SRCDIR_BASE}/packages/default/stage3-s390x" s390/17.0/s390x
                ;;
        esac
@@ -59,17 +55,13 @@ post_build() {
 
        pushd "${BUILD_SRCDIR_BASE}/builds/23.0-default" >/dev/null
        case ${spec} in
+       stage3-openrc-23.spec)
+               upload stage3-${SUBARCH}-openrc-${TIMESTAMP}.tar.xz*
+               ;;
        stage3-systemd-23.spec)
+               upload stage3-${SUBARCH}-systemd-${TIMESTAMP}.tar.xz*
                upsync_binpackages 
"${BUILD_SRCDIR_BASE}/packages/23.0-default/stage3-s390x" s390/23.0/s390x
                ;;
        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}.tar.xz*
-               ;;
-       esac
-       popd >/dev/null
 }