Upload 23.0 stages for amd64

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

1 files changed, 48 insertions, 62 deletions

diff --git a/tools/catalyst-auto-amd64.conf b/tools/catalyst-auto-amd64.conf
index a57c8e14..733b2b6c 100644
--- a/tools/catalyst-auto-amd64.conf
+++ b/tools/catalyst-auto-amd64.conf
@@ -27,12 +27,9 @@ SETS="
 	x32_openrc_23
 	x32_systemd_23
 	openrc
-	systemd_mu
 	livegui
 	nomultilib_openrc
-	nomultilib_systemd_mu
 	llvm_openrc
-	llvm_systemd_mu
 	hardened_openrc
 	hardened_nomultilib_openrc
 	hardened_selinux_openrc
@@ -41,7 +38,6 @@ SETS="
 	musl_hardened
 	musl_llvm
 	x32_openrc
-	x32_systemd_mu
 "
 
 # 17.0
@@ -51,9 +47,6 @@ SET_openrc_OPTIONAL_SPECS="stage3d-openrc.spec installcd-stage1.spec installcd-s
 
 SET_livegui_OPTIONAL_SPECS="livegui/livegui-stage1.spec livegui/livegui-stage2.spec"
 
-SET_systemd_mu_SPECS="stage1-systemd-mu.spec stage3-systemd-mu.spec"
-SET_systemd_mu_OPTIONAL_SPECS="stage3d-systemd-mu.spec"
-
 SET_hardened_openrc_SPECS="hardened/stage1-openrc.spec hardened/stage3-openrc.spec"
 SET_hardened_openrc_OPTIONAL_SPECS="hardened/admincd-stage1.spec hardened/admincd-stage2.spec"
 
@@ -65,12 +58,8 @@ SET_hardened_nomultilib_openrc_SPECS="hardened-nomultilib/stage1-openrc.spec har
 
 SET_nomultilib_openrc_SPECS="nomultilib/stage1-openrc.spec nomultilib/stage3-openrc.spec"
 
-SET_nomultilib_systemd_mu_SPECS="nomultilib/stage1-systemd-mu.spec nomultilib/stage3-systemd-mu.spec"
-
 SET_llvm_openrc_SPECS="clang/stage1-openrc.spec clang/stage3-openrc.spec"
 
-SET_llvm_systemd_mu_SPECS="clang/stage1-systemd-mu.spec clang/stage3-systemd-mu.spec"
-
 SET_musl_SPECS="musl/stage1.spec musl/stage3.spec"
 
 SET_musl_llvm_SPECS="musl-clang/stage1.spec musl-clang/stage3.spec"
@@ -79,8 +68,6 @@ SET_musl_hardened_SPECS="musl-hardened/stage1.spec musl-hardened/stage3.spec"
 
 SET_x32_openrc_SPECS="x32/stage1-openrc.spec x32/stage3-openrc.spec"
 
-SET_x32_systemd_mu_SPECS="x32/stage1-systemd-mu.spec x32/stage3-systemd-mu.spec"
-
 # 23.0
 
 SET_openrc_23_SPECS="stage1-openrc-23.spec stage3-openrc-23.spec"
@@ -150,22 +137,10 @@ post_build() {
 
 	pushd "${BUILD_SRCDIR_BASE}"/builds/default >/dev/null || exit
 	case ${spec} in
-	stage3-openrc.spec)
-		upload stage3-amd64-openrc-${TIMESTAMP}.tar.xz*
-		# do not upsync_binpackages, done by extra builder
-		;;
-	stage3d-openrc.spec)
-		upload stage3-amd64-desktop-openrc-${TIMESTAMP}.tar.xz*
-		;;
 	installcd-stage2-minimal.spec)
 		upload install-amd64-minimal-${TIMESTAMP}.iso*
 		;;
-	nomultilib/stage3-openrc.spec)
-		upload stage3-amd64-nomultilib-openrc-${TIMESTAMP}.tar.xz*
-		# do not upsync_binpackages, done by extra builder
-		;;
 	x32/stage3-openrc.spec)
-		upload stage3-x32-openrc-${TIMESTAMP}.tar.xz*
 		upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/default/stage3-x32" amd64/17.0/x32
 		;;
 	livegui/livegui-stage2.spec)
@@ -176,25 +151,35 @@ post_build() {
 
 	pushd "${BUILD_SRCDIR_BASE}"/builds/23.0-default >/dev/null || exit
 	case ${spec} in
-	x32/stage3-openrc-23.spec)
-		upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/23.0-default/stage3-x32" amd64/23.0/x32
+	stage3-openrc-23.spec)
+		upload stage3-amd64-openrc-${TIMESTAMP}.tar.xz*
+		# do not upsync_binpackages, done by extra builder
 		;;
-	esac
-	popd >/dev/null || exit
-
-	pushd "${BUILD_SRCDIR_BASE}"/builds/mergedusr >/dev/null || exit
-	case ${spec} in
-	stage3-systemd-mu.spec)
-		upload stage3-amd64-systemd-mergedusr-${TIMESTAMP}.tar.xz*
+	stage3d-openrc-23.spec)
+		upload stage3-amd64-desktop-openrc-${TIMESTAMP}.tar.xz*
+		# do not upsync_binpackages, done by extra builder
+		;;
+	stage3-systemd-23.spec)
+		upload stage3-amd64-systemd-${TIMESTAMP}.tar.xz*
+		# do not upsync_binpackages, done by extra builder
+		;;
+	stage3d-systemd-23.spec)
+		upload stage3-amd64-desktop-systemd-${TIMESTAMP}.tar.xz*
+		# do not upsync_binpackages, done by extra builder
 		;;
-	stage3d-systemd-mu.spec)
-		upload stage3-amd64-desktop-systemd-mergedusr-${TIMESTAMP}.tar.xz*
+	nomultilib/stage3-openrc-23.spec)
+		upload stage3-amd64-nomultilib-openrc-${TIMESTAMP}.tar.xz*
+		# do not upsync_binpackages, done by extra builder
 		;;
-	nomultilib/stage3-systemd-mu.spec)
-		upload stage3-amd64-nomultilib-systemd-mergedusr-${TIMESTAMP}.tar.xz*
+	nomultilib/stage3-systemd-23.spec)
+		upload stage3-amd64-nomultilib-systemd-${TIMESTAMP}.tar.xz*
 		;;
-	x32/stage3-systemd-mu.spec)
-		upload stage3-x32-systemd-mergedusr-${TIMESTAMP}.tar.xz*
+	x32/stage3-openrc-23.spec)
+		upload stage3-x32-openrc-${TIMESTAMP}.tar.xz*
+		;;
+	x32/stage3-systemd-23.spec)
+		upload stage3-x32-systemd-${TIMESTAMP}.tar.xz*
+		upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/23.0-default/stage3-x32" amd64/23.0/x32
 		;;
 	esac
 	popd >/dev/null || exit
@@ -202,7 +187,6 @@ post_build() {
 	pushd "${BUILD_SRCDIR_BASE}"/builds/clang >/dev/null || exit
 	case ${spec} in
 	clang/stage3-openrc.spec)
-		upload stage3-amd64-llvm-openrc-${TIMESTAMP}.tar.xz*
 		upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/clang/stage3-amd64" amd64/17.1/x86-64_llvm
 		;;
 	esac
@@ -210,53 +194,54 @@ post_build() {
 
 	pushd "${BUILD_SRCDIR_BASE}"/builds/23.0-llvm >/dev/null || exit
 	case ${spec} in
+	llvm/stage3-openrc-23.spec)
+		upload stage3-amd64-llvm-openrc-${TIMESTAMP}.tar.xz*
+		;;
 	llvm/stage3-systemd-23.spec)
+		upload stage3-amd64-llvm-systemd-${TIMESTAMP}.tar.xz*
 		upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/23.0-llvm/stage3-amd64" amd64/23.0/x86-64_llvm
 		;;
 	esac
 	popd >/dev/null || exit
 
-	pushd "${BUILD_SRCDIR_BASE}"/builds/llvm-mergedusr >/dev/null || exit
-	case ${spec} in
-	clang/stage3-systemd-mu.spec)
-		upload stage3-amd64-llvm-systemd-mergedusr-${TIMESTAMP}.tar.xz*
-		;;
-	esac
-	popd >/dev/null || exit
-
 	pushd "${BUILD_SRCDIR_BASE}"/builds/hardened >/dev/null || exit
 	case ${spec} in
 	hardened/stage3-openrc.spec)
-		upload stage3-amd64-hardened-openrc-${TIMESTAMP}.tar.xz*
 		upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/hardened/stage3-amd64" amd64/17.1/x86-64_hardened
 		;;
 	hardened/admincd-stage2.spec)
 		upload admincd-amd64-${TIMESTAMP}.iso*
 		;;
-	hardened-nomultilib/stage3-openrc.spec)
-		upload stage3-amd64-hardened-nomultilib-openrc-${TIMESTAMP}.tar.xz*
-		;;
-	hardened-selinux/stage3-openrc.spec)
-		upload stage3-amd64-hardened-selinux-openrc-${TIMESTAMP}.tar.xz*
-		;;
-	hardened-nomultilib-selinux/stage3-openrc.spec)
-		upload stage3-amd64-hardened-nomultilib-selinux-openrc-${TIMESTAMP}.tar.xz*
-		;;
 	esac
 	popd >/dev/null || exit
 
 	pushd "${BUILD_SRCDIR_BASE}"/builds/23.0-hardened >/dev/null || exit
 	case ${spec} in
+	hardened/stage3-openrc-23.spec)
+		upload stage3-amd64-hardened-openrc-${TIMESTAMP}.tar.xz*
+		;;
 	hardened/stage3-systemd-23.spec)
+		upload stage3-amd64-hardened-systemd-${TIMESTAMP}.tar.xz*
 		upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/23.0-hardened/stage3-amd64" amd64/23.0/x86-64_hardened
 		;;
+	hardened-nomultilib/stage3-openrc-23.spec)
+		upload stage3-amd64-hardened-nomultilib-openrc-${TIMESTAMP}.tar.xz*
+		;;
+	hardened-nomultilib/stage3-systemd-23.spec)
+		upload stage3-amd64-hardened-nomultilib-systemd-${TIMESTAMP}.tar.xz*
+		;;
+	hardened-selinux/stage3-openrc-23.spec)
+		upload stage3-amd64-hardened-selinux-openrc-${TIMESTAMP}.tar.xz*
+		;;
+	hardened-nomultilib-selinux/stage3-openrc-23.spec)
+		upload stage3-amd64-hardened-nomultilib-selinux-openrc-${TIMESTAMP}.tar.xz*
+		;;
 	esac
 	popd >/dev/null || exit
 
 	pushd "${BUILD_SRCDIR_BASE}"/builds/musl >/dev/null || exit
 	case ${spec} in
 	musl/stage3.spec)
-		upload stage3-amd64-musl-${TIMESTAMP}.tar.xz*
 		upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/musl/stage3-amd64" amd64/17.1/x86-64_musl
 		;;
 	esac
@@ -265,6 +250,7 @@ post_build() {
 	pushd "${BUILD_SRCDIR_BASE}"/builds/23.0-musl >/dev/null || exit
 	case ${spec} in
 	musl/stage3-23.spec)
+		upload stage3-amd64-musl-${TIMESTAMP}.tar.xz*
 		upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/23.0-musl/stage3-amd64" amd64/23.0/x86-64_musl
 		;;
 	esac
@@ -273,7 +259,6 @@ post_build() {
 	pushd "${BUILD_SRCDIR_BASE}"/builds/musl-clang >/dev/null || exit
 	case ${spec} in
 	musl-clang/stage3.spec)
-		upload stage3-amd64-musl-llvm-${TIMESTAMP}.tar.xz*
 		upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/musl-clang/stage3-amd64" amd64/17.1/x86-64_musl_llvm
 		;;
 	esac
@@ -282,6 +267,7 @@ post_build() {
 	pushd "${BUILD_SRCDIR_BASE}"/builds/23.0-musl-llvm >/dev/null || exit
 	case ${spec} in
 	musl-llvm/stage3-23.spec)
+		upload stage3-amd64-musl-llvm-${TIMESTAMP}.tar.xz*
 		upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/23.0-musl-llvm/stage3-amd64" amd64/23.0/x86-64_musl_llvm
 		;;
 	esac
@@ -290,7 +276,6 @@ post_build() {
 	pushd "${BUILD_SRCDIR_BASE}"/builds/musl-hardened >/dev/null || exit
 	case ${spec} in
 	musl-hardened/stage3.spec)
-		upload stage3-amd64-musl-hardened-${TIMESTAMP}.tar.xz*
 		upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/musl-hardened/stage3-amd64" amd64/17.1/x86-64_musl_hardened
 		;;
 	esac
@@ -299,6 +284,7 @@ post_build() {
 	pushd "${BUILD_SRCDIR_BASE}"/builds/23.0-musl-hardened >/dev/null || exit
 	case ${spec} in
 	musl-hardened/stage3-23.spec)
+		upload stage3-amd64-musl-hardened-${TIMESTAMP}.tar.xz*
 		upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/23.0-musl-hardened/stage3-amd64" amd64/23.0/x86-64_musl_hardened
 		;;
 	esac