From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1613955-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
	(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
	 key-exchange X25519 server-signature RSA-PSS (2048 bits))
	(No client certificate requested)
	by finch.gentoo.org (Postfix) with ESMTPS id 531B0158041
	for <garchives@archives.gentoo.org>; Sat, 23 Mar 2024 14:16:33 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
	by pigeon.gentoo.org (Postfix) with SMTP id 91770E2A16;
	Sat, 23 Mar 2024 14:16:32 +0000 (UTC)
Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183])
	(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
	 key-exchange X25519 server-signature RSA-PSS (4096 bits))
	(No client certificate requested)
	by pigeon.gentoo.org (Postfix) with ESMTPS id 6688CE2A16
	for <gentoo-commits@lists.gentoo.org>; Sat, 23 Mar 2024 14:16:32 +0000 (UTC)
Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52])
	(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
	 key-exchange X25519 server-signature RSA-PSS (4096 bits))
	(No client certificate requested)
	by smtp.gentoo.org (Postfix) with ESMTPS id 6CD9D335D6E
	for <gentoo-commits@lists.gentoo.org>; Sat, 23 Mar 2024 14:16:31 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
	by oystercatcher.gentoo.org (Postfix) with ESMTP id 05AC1156A
	for <gentoo-commits@lists.gentoo.org>; Sat, 23 Mar 2024 14:16:30 +0000 (UTC)
From: "Andreas K. Hüttel" <dilfridge@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Andreas K. Hüttel" <dilfridge@gentoo.org>
Message-ID: <1711203375.73b527f09bc993037cae0b480e8a19a78dfeda7d.dilfridge@gentoo>
Subject: [gentoo-commits] proj/releng:master commit in: tools/
X-VCS-Repository: proj/releng
X-VCS-Files: tools/catalyst-auto-sparc64.conf
X-VCS-Directories: tools/
X-VCS-Committer: dilfridge
X-VCS-Committer-Name: Andreas K. Hüttel
X-VCS-Revision: 73b527f09bc993037cae0b480e8a19a78dfeda7d
X-VCS-Branch: master
Date: Sat, 23 Mar 2024 14:16:30 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: f082dabd-d494-45d6-bb13-07622abbb97b
X-Archives-Hash: 8c40976dbc2d5ec495e6c1c6654b2eb7

commit:     73b527f09bc993037cae0b480e8a19a78dfeda7d
Author:     Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 23 14:16:15 2024 +0000
Commit:     Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sat Mar 23 14:16:15 2024 +0000
URL:        https://gitweb.gentoo.org/proj/releng.git/commit/?id=73b527f0

Upload 23.0 stages for sparc

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

 tools/catalyst-auto-sparc64.conf | 25 ++++++++-----------------
 1 file changed, 8 insertions(+), 17 deletions(-)

diff --git a/tools/catalyst-auto-sparc64.conf b/tools/catalyst-auto-sparc64.conf
index 34b7553d..d094f457 100644
--- a/tools/catalyst-auto-sparc64.conf
+++ b/tools/catalyst-auto-sparc64.conf
@@ -11,17 +11,13 @@ SETS="
 	openrc_64_23
 	systemd_64_23
 	openrc_32
-	systemd_32_mu
 	openrc_64
-	systemd_64_mu
 "
 
 SET_openrc_32_SPECS="sparc/stage1.spec sparc/stage3.spec"
-SET_systemd_32_mu_SPECS="sparc/systemd-stage1-mu.spec sparc/systemd-stage3-mu.spec"
 
 SET_openrc_64_SPECS="sparc64/stage1.spec sparc64/stage3.spec"
 SET_openrc_64_OPTIONAL_SPECS="sparc64/installcd-stage1.spec sparc64/installcd-stage2-minimal.spec"
-SET_systemd_64_mu_SPECS="sparc64/systemd-stage1-mu.spec sparc64/systemd-stage3-mu.spec"
 
 SET_openrc_32_23_SPECS="sparc/stage1-openrc-23.spec sparc/stage3-openrc-23.spec"
 SET_systemd_32_23_SPECS="sparc/stage1-systemd-23.spec sparc/stage3-systemd-23.spec"
@@ -61,11 +57,9 @@ post_build() {
 		upload *${TIMESTAMP}*.iso*
 		;;
 	sparc/stage3.spec)
-		upload stage3-sparc-${TIMESTAMP}*.xz*
 		upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/default/stage3-sparc" sparc/17.0/32
 		;;
 	sparc64/stage3.spec)
-		upload stage3-sparc64-${TIMESTAMP}*.xz*
 		upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/default/stage3-sparc64" sparc/17.0/64
 		;;
 	esac
@@ -73,23 +67,20 @@ post_build() {
 
 	pushd "${BUILD_SRCDIR_BASE}/builds/23.0-default" >/dev/null
 	case ${spec} in
+	sparc/stage3-openrc-23.spec)
+		upload stage3-sparc-openrc-${TIMESTAMP}*.xz*
+		;;
 	sparc/stage3-systemd-23.spec)
+		upload stage3-sparc-systemd-${TIMESTAMP}*.xz*
 		upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/23.0-default/stage3-sparc" sparc/23.0/32
 		;;
+	sparc64/stage3-openrc-23.spec)
+		upload stage3-sparc64-openrc-${TIMESTAMP}*.xz*
+		;;
 	sparc64/stage3-systemd-23.spec)
+		upload stage3-sparc64-systemd-${TIMESTAMP}*.xz*
 		upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/23.0-default/stage3-sparc64" sparc/23.0/64
 		;;
 	esac
 	popd >/dev/null
-
-	pushd "${BUILD_SRCDIR_BASE}/builds/mergedusr" >/dev/null
-	case ${spec} in
-	sparc/systemd-stage3-mu.spec)
-		upload stage3-sparc-systemd-mergedusr-${TIMESTAMP}*.xz*
-		;;
-	sparc64/systemd-stage3-mu.spec)
-		upload stage3-sparc64-systemd-mergedusr-${TIMESTAMP}*.xz*
-		;;
-	esac
-	popd >/dev/null
 }