From a0ac381be07f76eeec07425ea399d393ff3f81b2 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 00:27:41 +0100
Subject: [PATCH] Add alpha 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>
---
 releases/specs-qemu/alpha/stage1-systemd-mu.spec | 12 ++++++++++++
 releases/specs-qemu/alpha/stage3-systemd-mu.spec | 10 ++++++++++
 tools/catalyst-auto-qemu-alpha.conf              |  7 ++++++-
 3 files changed, 28 insertions(+), 1 deletion(-)
 create mode 100644 releases/specs-qemu/alpha/stage1-systemd-mu.spec
 create mode 100644 releases/specs-qemu/alpha/stage3-systemd-mu.spec

diff --git a/releases/specs-qemu/alpha/stage1-systemd-mu.spec b/releases/specs-qemu/alpha/stage1-systemd-mu.spec
new file mode 100644
index 00000000..5be5a1c0
--- /dev/null
+++ b/releases/specs-qemu/alpha/stage1-systemd-mu.spec
@@ -0,0 +1,12 @@
+subarch: alpha
+target: stage1
+version_stamp: systemd-mergedusr-@TIMESTAMP@
+rel_type: default
+profile: default/linux/alpha/17.0/systemd/merged-usr
+snapshot: @TIMESTAMP@
+source_subpath: default/stage3-alpha-systemd-mergedusr-latest
+update_seed: no
+update_seed_command: -uDN @world
+portage_confdir: @REPO_DIR@/releases/portage/stages-qemu
+interpreter: /usr/bin/qemu-alpha
+compression_mode: pixz
diff --git a/releases/specs-qemu/alpha/stage3-systemd-mu.spec b/releases/specs-qemu/alpha/stage3-systemd-mu.spec
new file mode 100644
index 00000000..49530c53
--- /dev/null
+++ b/releases/specs-qemu/alpha/stage3-systemd-mu.spec
@@ -0,0 +1,10 @@
+subarch: alpha
+target: stage3
+version_stamp: systemd-mergedusr-@TIMESTAMP@
+rel_type: default
+profile: default/linux/alpha/17.0/systemd/merged-usr
+snapshot: @TIMESTAMP@
+source_subpath: default/stage1-alpha-systemd-mergedusr-@TIMESTAMP@
+portage_confdir: @REPO_DIR@/releases/portage/stages-qemu
+interpreter: /usr/bin/qemu-alpha
+compression_mode: pixz
diff --git a/tools/catalyst-auto-qemu-alpha.conf b/tools/catalyst-auto-qemu-alpha.conf
index 323bd88d..e2eca036 100644
--- a/tools/catalyst-auto-qemu-alpha.conf
+++ b/tools/catalyst-auto-qemu-alpha.conf
@@ -6,13 +6,15 @@ UPLOAD_KEY=/root/.ssh/id_rsa
 SPECS_DIR=${REPO_DIR}/releases/specs-qemu/alpha
 EMAIL_SUBJECT_PREPEND="[alpha-qemu-auto]"
 
-SETS="openrc systemd"
+SETS="openrc systemd systemdmu"
 
 SET_openrc_SPECS="stage1-openrc.spec stage3-openrc.spec"
 SET_openrc_OPTIONAL_SPECS="installcd-stage1.spec installcd-stage2-minimal.spec"
 
 SET_systemd_SPECS="stage1-systemd.spec stage3-systemd.spec"
 
+SET_systemdmu_SPECS="stage1-systemd-mu.spec stage3-systemd-mu.spec"
+
 KCONFIG_DIR=${REPO_DIR}/releases/kconfig/alpha
 
 update_symlinks() {
@@ -43,6 +45,9 @@ post_build() {
 	stage3-systemd.spec)
 		upload stage3-*systemd-${TIMESTAMP}*.xz*
 		;;
+	stage3-systemd-mu.spec)
+		upload stage3-*systemd-mergedusr-${TIMESTAMP}*.xz*
+		;;
 	*)
 		echo "Finished ${spec}"
 		;;