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

[Andreas K. Hüttel]

commit:     858d00cd634502fed8325caacbb1fbe4e8291c1f
Author:     Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Fri Feb 16 22:09:33 2024 +0000
Commit:     Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Fri Feb 16 22:09:33 2024 +0000
URL:        https://gitweb.gentoo.org/proj/releng.git/commit/?id=858d00cd

Enable ia64 23.0 builds

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

 tools/catalyst-auto-ia64.conf | 25 +++++++++++++++----------
 1 file changed, 15 insertions(+), 10 deletions(-)

diff --git a/tools/catalyst-auto-ia64.conf b/tools/catalyst-auto-ia64.conf
index 47c24f74..db010a8d 100644
--- a/tools/catalyst-auto-ia64.conf
+++ b/tools/catalyst-auto-ia64.conf
@@ -8,6 +8,8 @@ SPECS_DIR=${REPO_DIR}/releases/specs/ia64
 SETS="
        openrc
        systemd_mu
+       openrc_23
+       systemd_23
 "
 
 SET_openrc_SPECS="stage1-openrc.spec stage3-openrc.spec"
@@ -15,6 +17,11 @@ SET_openrc_OPTIONAL_SPECS="installcd-stage1.spec 
installcd-stage2-minimal.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"
+
+
 KCONFIG_DIR=${REPO_DIR}/releases/kconfig/ia64
 
 update_symlinks() {
@@ -34,22 +41,20 @@ update_symlinks() {
 post_build() {
        local set=$1 spec=$2
 
-       pushd "${BUILD_SRCDIR_BASE}/builds/default" >/dev/null
+       pushd "${BUILD_SRCDIR_BASE}" >/dev/null
        case ${spec} in
        installcd-stage2*)
-               upload *${TIMESTAMP}*.iso*
+               upload builds/default/*${TIMESTAMP}*.iso*
                ;;
        stage3-openrc.spec)
-               upload stage3-ia64-openrc-${TIMESTAMP}.tar.xz*
-               upsync_binpackages 
"${BUILD_SRCDIR_BASE}/packages/default/stage3-ia64" ia64/17.0/ia64
+               upload builds/default/stage3-ia64-openrc-${TIMESTAMP}.tar.xz*
+               upsync_binpackages packages/default/stage3-ia64 ia64/17.0/ia64
                ;;
-       esac
-       popd >/dev/null
-
-       pushd "${BUILD_SRCDIR_BASE}/builds/mergedusr" >/dev/null
-       case ${spec} in
        stage3-systemd-mu.spec)
-               upload stage3-ia64-systemd-mergedusr-${TIMESTAMP}.tar.xz*
+               upload 
builds/mergedusr/stage3-ia64-systemd-mergedusr-${TIMESTAMP}.tar.xz*
+               ;;
+       stage3-systemd-23.spec)
+               upsync_binpackages packages/23.0-default/stage3-ia64 
ia64/23.0/ia64
                ;;
        esac
        popd >/dev/null