From f1f0eaa27cfeac2335a7c16575205e5e06222f6b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20K=2E=20H=C3=BCttel?= <dilfridge@gentoo.org>
Date: Fri, 15 Dec 2023 19:37:45 +0100
Subject: [PATCH] Enable all m68k 23.0 builds
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Andreas K. Hüttel <dilfridge@gentoo.org>
---
 tools/catalyst-auto-qemu-m68k.conf | 29 ++++++++++++++++++++++-------
 1 file changed, 22 insertions(+), 7 deletions(-)

diff --git a/tools/catalyst-auto-qemu-m68k.conf b/tools/catalyst-auto-qemu-m68k.conf
index ed9f3b3e..0a6615f8 100644
--- a/tools/catalyst-auto-qemu-m68k.conf
+++ b/tools/catalyst-auto-qemu-m68k.conf
@@ -14,17 +14,23 @@ SETS="
 	musl
 	openrc
 	systemd_mu
+	musl_23
+	openrc_23
+	systemd_23
 "
 
 SET_openrc_SPECS="stage1-openrc.spec stage3-openrc.spec"
-SET_systemd_SPECS="stage1-systemd.spec stage3-systemd.spec"
 SET_systemd_mu_SPECS="stage1-systemd-mu.spec stage3-systemd-mu.spec"
 SET_musl_SPECS="stage1-musl.spec stage3-musl.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"
+SET_musl_23_SPECS="stage1-musl-23.spec stage3-musl-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
@@ -42,11 +48,6 @@ post_build() {
 		stage3-openrc.spec)
 			pushd "${BUILD_SRCDIR_BASE}/builds/default" >/dev/null
 			upload stage3-m68k-openrc-${TIMESTAMP}*.xz*
-			popd >/dev/null
-			;;
-		stage3-systemd.spec)
-			pushd "${BUILD_SRCDIR_BASE}/builds/default" >/dev/null
-			upload stage3-m68k-systemd-${TIMESTAMP}*.xz*
 			upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/default/stage3-m68k" m68k/17.0/m68k
 			popd >/dev/null
 			;;
@@ -61,6 +62,20 @@ post_build() {
 			upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/musl/stage3-m68k_musl" m68k/17.0/m68k_musl
 			popd >/dev/null
 			;;
+		stage3-openrc-23.spec)
+			pushd "${BUILD_SRCDIR_BASE}/builds/23.0-default" >/dev/null
+			popd >/dev/null
+			;;
+		stage3-systemd-23.spec)
+			pushd "${BUILD_SRCDIR_BASE}/builds/23.0-default" >/dev/null
+			upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/23.0-default/stage3-m68k" m68k/23.0/m68k
+			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-m68k_musl" m68k/23.0/m68k_musl
+			popd >/dev/null
+			;;
 		*)
 			echo "Finished ${spec}"
 			;;