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

[Andreas K. Hüttel]

commit:     160dac9be23dfdf3ec6ae379c0df49b3b1dc1de5
Author:     Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 22 21:57:52 2024 +0000
Commit:     Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Fri Mar 22 21:57:52 2024 +0000
URL:        https://gitweb.gentoo.org/proj/releng.git/commit/?id=160dac9b

Upload 23.0 stages for hppa

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

 tools/catalyst-auto-hppa.conf | 27 ++++++++-------------------
 1 file changed, 8 insertions(+), 19 deletions(-)

diff --git a/tools/catalyst-auto-hppa.conf b/tools/catalyst-auto-hppa.conf
index 7b3e9bb7..f07c6a39 100644
--- a/tools/catalyst-auto-hppa.conf
+++ b/tools/catalyst-auto-hppa.conf
@@ -11,21 +11,15 @@ SETS="
        hppa20_openrc_23
        hppa20_systemd_23
        hppa11_openrc
-       hppa11_systemd_mu 
        hppa20_openrc 
-       hppa20_systemd_mu
 "
 
 SET_hppa11_openrc_SPECS="hppa1.1/stage1-openrc.spec hppa1.1/stage3-openrc.spec"
 SET_hppa11_openrc_OPTIONAL_SPECS="installcd-stage1.spec 
installcd-stage2-minimal.spec netboot-hppa32.spec"
 
-SET_hppa11_systemd_mu_SPECS="hppa1.1/stage1-systemd-mu.spec 
hppa1.1/stage3-systemd-mu.spec"
-
 SET_hppa20_openrc_SPECS="hppa2.0/stage1-openrc.spec hppa2.0/stage3-openrc.spec"
 SET_hppa20_openrc_OPTIONAL_SPECS="netboot-hppa64.spec"
 
-SET_hppa20_systemd_mu_SPECS="hppa2.0/stage1-systemd-mu.spec 
hppa2.0/stage3-systemd-mu.spec"
-
 SET_hppa11_openrc_23_SPECS="hppa1.1/stage1-openrc-23.spec 
hppa1.1/stage3-openrc-23.spec"
 
 SET_hppa11_systemd_23_SPECS="hppa1.1/stage1-systemd-23.spec 
hppa1.1/stage3-systemd-23.spec"
@@ -76,11 +70,9 @@ post_build() {
                upload install-hppa-minimal-*${TIMESTAMP}*.iso*
                ;;
        hppa1.1/stage3-openrc.spec)
-               upload stage3-hppa1.1-openrc-${TIMESTAMP}.tar.xz*
                upsync_binpackages 
"${BUILD_SRCDIR_BASE}/packages/default/stage3-hppa1.1" hppa/17.0/hppa1.1
                ;;
        hppa2.0/stage3-openrc.spec)
-               upload stage3-hppa2.0-openrc-${TIMESTAMP}.tar.xz*
                upsync_binpackages 
"${BUILD_SRCDIR_BASE}/packages/default/stage3-hppa2.0" hppa/17.0/hppa2.0
                ;;
        esac
@@ -88,23 +80,20 @@ post_build() {
 
        pushd "${BUILD_SRCDIR_BASE}/builds/23.0-default" >/dev/null
        case ${spec} in
+       hppa1.1/stage3-openrc-23.spec)
+               upload stage3-hppa1.1-openrc-${TIMESTAMP}.tar.xz*
+               ;;
        hppa1.1/stage3-systemd-23.spec)
+               upload stage3-hppa1.1-systemd-${TIMESTAMP}.tar.xz*
                upsync_binpackages 
"${BUILD_SRCDIR_BASE}/packages/23.0-default/stage3-hppa1.1" hppa/23.0/hppa1.1
                ;;
+       hppa2.0/stage3-openrc-23.spec)
+               upload stage3-hppa2.0-openrc-${TIMESTAMP}.tar.xz*
+               ;;
        hppa2.0/stage3-systemd-23.spec)
+               upload stage3-hppa2.0-systemd-${TIMESTAMP}.tar.xz*
                upsync_binpackages 
"${BUILD_SRCDIR_BASE}/packages/23.0-default/stage3-hppa2.0" hppa/23.0/hppa2.0
                ;;
        esac
        popd >/dev/null
-
-       pushd "${BUILD_SRCDIR_BASE}/builds/mergedusr" >/dev/null
-       case ${spec} in
-       hppa1.1/stage3-systemd-mu.spec)
-               upload stage3-hppa1.1-systemd-mergedusr-${TIMESTAMP}.tar.xz*
-               ;;
-       hppa2.0/stage3-systemd-mu.spec)
-               upload stage3-hppa2.0-systemd-mergedusr-${TIMESTAMP}.tar.xz*
-               ;;
-       esac
-       popd >/dev/null
 }