commit:     d4bd1a2dcd93960fb119a78800f7eca2ed44737b
Author:     Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 11 17:17:53 2023 +0000
Commit:     Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Mon Dec 11 17:17:53 2023 +0000
URL:        https://gitweb.gentoo.org/proj/releng.git/commit/?id=d4bd1a2d

Enable riscv 23.0 autobuilds and binpkg uploads

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

 tools/catalyst-auto-qemu-riscv.conf | 34 +++++++++++++++++++++++++++++++++-
 1 file changed, 33 insertions(+), 1 deletion(-)

diff --git a/tools/catalyst-auto-qemu-riscv.conf 
b/tools/catalyst-auto-qemu-riscv.conf
index e8a20391..5aa73f0b 100644
--- a/tools/catalyst-auto-qemu-riscv.conf
+++ b/tools/catalyst-auto-qemu-riscv.conf
@@ -19,6 +19,14 @@ SETS="
        lp64_musl
        multilib_openrc
        multilib_systemd_mu
+       lp64d_openrc_23
+       lp64d_systemd_23
+       lp64d_musl_23
+       lp64_openrc_23
+       lp64_systemd_23
+       lp64_musl_23
+       multilib_openrc_23
+       multilib_systemd_23
 "
 
 SET_lp64d_musl_SPECS="stage1-lp64d-musl.spec stage3-lp64d-musl.spec"
@@ -32,10 +40,21 @@ SET_lp64_systemd_mu_SPECS="stage1-lp64-systemd-mu.spec 
stage3-lp64-systemd-mu.sp
 SET_multilib_openrc_SPECS="stage1-multilib-openrc.spec 
stage3-multilib-openrc.spec"
 SET_multilib_systemd_mu_SPECS="stage1-multilib-systemd-mu.spec 
stage3-multilib-systemd-mu.spec"
 
+SET_lp64d_musl_23_SPECS="stage1-lp64d-musl-23.spec stage3-lp64d-musl-23.spec"
+SET_lp64d_openrc_23_SPECS="stage1-lp64d-openrc-23.spec 
stage3-lp64d-openrc-23.spec"
+SET_lp64d_systemd_23_SPECS="stage1-lp64d-systemd-23.spec 
stage3-lp64d-systemd-23.spec"
+
+SET_lp64_musl_23_SPECS="stage1-lp64-musl-23.spec stage3-lp64-musl-23.spec"
+SET_lp64_openrc_23_SPECS="stage1-lp64-openrc-23.spec 
stage3-lp64-openrc-23.spec"
+SET_lp64_systemd_23_SPECS="stage1-lp64-systemd-23.spec 
stage3-lp64-systemd-23.spec"
+
+SET_multilib_openrc_23_SPECS="stage1-multilib-openrc-23.spec 
stage3-multilib-openrc-23.spec"
+SET_multilib_systemd_23_SPECS="stage1-multilib-systemd-23.spec 
stage3-multilib-systemd-23.spec"
+
 update_symlinks() {
        # Symlink the latest stages3 to build from
        local d f
-       for d in "${BUILD_SRCDIR_BASE}/builds/default" 
"${BUILD_SRCDIR_BASE}/builds/mergedusr" "${BUILD_SRCDIR_BASE}/builds/musl" ; do
+       for d in "${BUILD_SRCDIR_BASE}/builds"/* ; do
                mkdir -p "${d}"
                pushd "${d}" >/dev/null
                for f in $(ls stage3*xz | grep -v latest | 
give_latest_from_dates) ; do
@@ -50,6 +69,19 @@ post_build() {
        local set=$1 spec=$2
 
        case ${spec} in
+               stage3*systemd-23.spec)
+                       pushd "${BUILD_SRCDIR_BASE}/builds/23.0-default" 
>/dev/null
+                       upsync_binpackages 
"${BUILD_SRCDIR_BASE}/packages/23.0-default/stage3-rv64_lp64d" 
riscv/23.0/rv64_lp64d
+                       upsync_binpackages 
"${BUILD_SRCDIR_BASE}/packages/23.0-default/stage3-rv64_lp64" 
riscv/23.0/rv64_lp64
+                       upsync_binpackages 
"${BUILD_SRCDIR_BASE}/packages/23.0-default/stage3-rv64_multilib" 
riscv/23.0/rv64_multilib
+                       popd >/dev/null
+                       ;;
+               stage3*musl-23.spec)
+                       pushd "${BUILD_SRCDIR_BASE}/builds/23.0-musl" >/dev/null
+                       upsync_binpackages 
"${BUILD_SRCDIR_BASE}/packages/23.0-musl/stage3-rv64_lp64d_musl" 
riscv/23.0/rv64_lp64d_musl
+                       upsync_binpackages 
"${BUILD_SRCDIR_BASE}/packages/23.0-musl/stage3-rv64_lp64_musl" 
riscv/23.0/rv64_lp64_musl
+                       popd >/dev/null
+                       ;;
                stage3*openrc.spec)
                        pushd "${BUILD_SRCDIR_BASE}/builds/default" >/dev/null
                        upload stage3-rv64_$(echo ${spec}|sed -e 
's:^stage3-::g' -e 's:\.spec$::g')-${TIMESTAMP}*.xz*

Reply via email to