From 6a55a8d80ab11d93245d0c26dcfa04671ffbf239 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20K=2E=20H=C3=BCttel?= <dilfridge@gentoo.org>
Date: Wed, 16 Nov 2022 22:48:47 +0100
Subject: [PATCH] Add loong systemd merged-usr build
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>
---
 .../specs-qemu/loong/stage1-systemd-mu.spec    | 13 +++++++++++++
 .../specs-qemu/loong/stage3-systemd-mu.spec    | 11 +++++++++++
 tools/catalyst-auto-qemu-loong.conf            | 18 ++++++++++++++----
 3 files changed, 38 insertions(+), 4 deletions(-)
 create mode 100644 releases/specs-qemu/loong/stage1-systemd-mu.spec
 create mode 100644 releases/specs-qemu/loong/stage3-systemd-mu.spec

diff --git a/releases/specs-qemu/loong/stage1-systemd-mu.spec b/releases/specs-qemu/loong/stage1-systemd-mu.spec
new file mode 100644
index 00000000..c745deae
--- /dev/null
+++ b/releases/specs-qemu/loong/stage1-systemd-mu.spec
@@ -0,0 +1,13 @@
+subarch: loong
+version_stamp: systemd-mergedusr-@TIMESTAMP@
+target: stage1
+rel_type: default
+profile: default/linux/loong/22.0/la64v100/lp64d/systemd/merged-usr
+snapshot: @TIMESTAMP@
+source_subpath: default/stage3-loong-systemd-mergedusr-latest
+compression_mode: pixz
+update_seed: no
+update_seed_command: -uDN @world
+portage_confdir: @REPO_DIR@/releases/portage/stages-qemu
+portage_prefix: releng
+interpreter: /usr/bin/qemu-loongarch64
diff --git a/releases/specs-qemu/loong/stage3-systemd-mu.spec b/releases/specs-qemu/loong/stage3-systemd-mu.spec
new file mode 100644
index 00000000..5de56ba7
--- /dev/null
+++ b/releases/specs-qemu/loong/stage3-systemd-mu.spec
@@ -0,0 +1,11 @@
+subarch: loong
+version_stamp: systemd-mergedusr-@TIMESTAMP@
+target: stage3
+rel_type: default
+profile: default/linux/loong/22.0/la64v100/lp64d/systemd/merged-usr
+snapshot: @TIMESTAMP@
+source_subpath: default/stage1-loong-systemd-mergedusr-@TIMESTAMP@
+compression_mode: pixz
+portage_confdir: @REPO_DIR@/releases/portage/stages-qemu
+portage_prefix: releng
+interpreter: /usr/bin/qemu-loongarch64
diff --git a/tools/catalyst-auto-qemu-loong.conf b/tools/catalyst-auto-qemu-loong.conf
index 5f140c17..69004e40 100644
--- a/tools/catalyst-auto-qemu-loong.conf
+++ b/tools/catalyst-auto-qemu-loong.conf
@@ -13,11 +13,15 @@ EMAIL_SUBJECT_PREPEND="[loong-qemu-auto]"
 SETS="
 	openrc
 	systemd
+	systemd_mu
 "
 
 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"
+
 update_symlinks() {
 	# Symlink the latest stages3 to build from
 	local d f
@@ -34,14 +38,20 @@ update_symlinks() {
 post_build() {
 	local set=$1 spec=$2
 
+	pushd "${BUILD_SRCDIR_BASE}/builds/default" >/dev/null
 	case ${spec} in
-		stage3*.spec)
-			pushd "${BUILD_SRCDIR_BASE}/builds/default" >/dev/null
-			upload stage3-loong-$(echo ${spec}|sed -e 's:^stage3-::g' -e 's:\.spec$::g')-${TIMESTAMP}*.xz*
-			popd >/dev/null
+		stage3-openrc.spec)
+			upload stage3-loong-openrc-${TIMESTAMP}*.xz*
+			;;
+		stage3-systemd.spec)
+			upload stage3-loong-systemd-${TIMESTAMP}*.xz*
+			;;
+		stage3-systemd-mu.spec)
+			upload stage3-loong-systemd-mergedusr-${TIMESTAMP}*.xz*
 			;;
 		*)
 			echo "Finished ${spec}"
 			;;
 	esac
+	popd >/dev/null
 }