Upload 23.0 stages for riscv

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

1 files changed, 34 insertions, 33 deletions

diff --git a/tools/catalyst-auto-qemu-riscv.conf b/tools/catalyst-auto-qemu-riscv.conf
index 46cdbddb..328b500a 100644
--- a/tools/catalyst-auto-qemu-riscv.conf
+++ b/tools/catalyst-auto-qemu-riscv.conf
@@ -20,25 +20,19 @@ SETS="
 	multilib_openrc_23
 	multilib_systemd_23
 	lp64d_openrc
-	lp64d_systemd_mu
 	lp64d_musl
 	lp64_openrc
-	lp64_systemd_mu
 	lp64_musl
 	multilib_openrc
-	multilib_systemd_mu
 "
 
 SET_lp64d_musl_SPECS="stage1-lp64d-musl.spec stage3-lp64d-musl.spec"
 SET_lp64d_openrc_SPECS="stage1-lp64d-openrc.spec stage3-lp64d-openrc.spec"
-SET_lp64d_systemd_mu_SPECS="stage1-lp64d-systemd-mu.spec stage3-lp64d-systemd-mu.spec"
 
 SET_lp64_musl_SPECS="stage1-lp64-musl.spec stage3-lp64-musl.spec"
 SET_lp64_openrc_SPECS="stage1-lp64-openrc.spec stage3-lp64-openrc.spec"
-SET_lp64_systemd_mu_SPECS="stage1-lp64-systemd-mu.spec stage3-lp64-systemd-mu.spec"
 
 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"
@@ -68,42 +62,49 @@ update_symlinks() {
 post_build() {
 	local set=$1 spec=$2
 
+	pushd "${BUILD_SRCDIR_BASE}" >/dev/null
 	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-lp64d-openrc-23.spec)
+			upload builds/23.0-default/stage3-rv64_lp64d-openrc-${TIMESTAMP}*.xz*
 			;;
-		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-lp64d-systemd-23.spec)
+			upload builds/23.0-default/stage3-rv64_lp64d-systemd-${TIMESTAMP}*.xz*
+			upsync_binpackages packages/23.0-default/stage3-rv64_lp64d riscv/23.0/rv64_lp64d
 			;;
-		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*
-			upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/default/stage3-rv64_lp64d" riscv/20.0/rv64_lp64d
-			upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/default/stage3-rv64_lp64" riscv/20.0/rv64_lp64
-			upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/default/stage3-rv64_multilib" riscv/20.0/rv64_multilib
-			popd >/dev/null
+		stage3-lp64-openrc-23.spec)
+			upload builds/23.0-default/stage3-rv64_lp64-openrc-${TIMESTAMP}*.xz*
+			;;
+		stage3-lp64-systemd-23.spec)
+			upload builds/23.0-default/stage3-rv64_lp64-systemd-${TIMESTAMP}*.xz*
+			upsync_binpackages packages/23.0-default/stage3-rv64_lp64 riscv/23.0/rv64_lp64
+			;;
+		stage3-multilib-openrc-23.spec)
+			upload builds/23.0-default/stage3-rv64_multilib-openrc-${TIMESTAMP}*.xz*
+			;;
+		stage3-multilib-systemd-23.spec)
+			upload builds/23.0-default/stage3-rv64_multilib-systemd-${TIMESTAMP}*.xz*
+			upsync_binpackages packages/23.0-default/stage3-rv64_multilib riscv/23.0/rv64_multilib
 			;;
-		stage3*systemd-mu.spec)
-			pushd "${BUILD_SRCDIR_BASE}/builds/mergedusr" >/dev/null
-			upload stage3-rv64_$(echo ${spec}|sed -e 's:^stage3-::g' -e 's:\.spec$::g' -e 's:-mu:-mergedusr:g')-${TIMESTAMP}*.xz*
-			popd >/dev/null
+		stage3-lp64d-musl-23.spec)
+			upload builds/23.0-musl/stage3-rv64_lp64d_musl-${TIMESTAMP}*.xz*
+			upsync_binpackages packages/23.0-musl/stage3-rv64_lp64d_musl riscv/23.0/rv64_lp64d_musl
+			;;
+		stage3-lp64-musl-23.spec)
+			upload builds/23.0-musl/stage3-rv64_lp64_musl-${TIMESTAMP}*.xz*
+			upsync_binpackages packages/23.0-musl/stage3-rv64_lp64_musl riscv/23.0/rv64_lp64_musl
+			;;
+		stage3*openrc.spec)
+			upsync_binpackages packages/default/stage3-rv64_lp64d riscv/20.0/rv64_lp64d
+			upsync_binpackages packages/default/stage3-rv64_lp64 riscv/20.0/rv64_lp64
+			upsync_binpackages packages/default/stage3-rv64_multilib riscv/20.0/rv64_multilib
 			;;
 		stage3*musl.spec)
-			pushd "${BUILD_SRCDIR_BASE}/builds/musl" >/dev/null
-			upload stage3-rv64_$(echo ${spec}|sed -e 's:^stage3-::g' -e 's:-:_:g' -e 's:\.spec$::g')-${TIMESTAMP}*.xz*
-			upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/musl/stage3-rv64_lp64d_musl" riscv/20.0/rv64_lp64d_musl
-			upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/musl/stage3-rv64_lp64_musl" riscv/20.0/rv64_lp64_musl
-			popd >/dev/null
+			upsync_binpackages packages/musl/stage3-rv64_lp64d_musl riscv/20.0/rv64_lp64d_musl
+			upsync_binpackages packages/musl/stage3-rv64_lp64_musl riscv/20.0/rv64_lp64_musl
 			;;
 		*)
 			echo "Finished ${spec}"
 			;;
 	esac
+	popd >/dev/null
 }