commit: 3a3df3551918797f0b7e8aac4f1ad1ad34b25c81
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Thu Nov 17 01:52:59 2022 +0000
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Thu Nov 17 01:52:59 2022 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=3a3df355
Add m68k systemd merged-usr build
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
releases/specs-qemu/m68k/stage1-systemd-mu.spec | 13 +++++++++++++
releases/specs-qemu/m68k/stage3-systemd-mu.spec | 11 +++++++++++
tools/catalyst-auto-qemu-m68k.conf | 16 ++++++++++++++--
3 files changed, 38 insertions(+), 2 deletions(-)
diff --git a/releases/specs-qemu/m68k/stage1-systemd-mu.spec
b/releases/specs-qemu/m68k/stage1-systemd-mu.spec
new file mode 100644
index 00000000..ae5ec941
--- /dev/null
+++ b/releases/specs-qemu/m68k/stage1-systemd-mu.spec
@@ -0,0 +1,13 @@
+subarch: m68k
+version_stamp: systemd-mergedusr-@TIMESTAMP@
+target: stage1
+rel_type: default
+profile: default/linux/m68k/17.0/systemd/merged-usr
+snapshot: @TIMESTAMP@
+source_subpath: default/stage3-m68k-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-m68k
diff --git a/releases/specs-qemu/m68k/stage3-systemd-mu.spec
b/releases/specs-qemu/m68k/stage3-systemd-mu.spec
new file mode 100644
index 00000000..527b2056
--- /dev/null
+++ b/releases/specs-qemu/m68k/stage3-systemd-mu.spec
@@ -0,0 +1,11 @@
+subarch: m68k
+version_stamp: systemd-mergedusr-@TIMESTAMP@
+target: stage3
+rel_type: default
+profile: default/linux/m68k/17.0/systemd/merged-usr
+snapshot: @TIMESTAMP@
+source_subpath: default/stage1-m68k-systemd-mergedusr-@TIMESTAMP@
+compression_mode: pixz
+portage_confdir: @REPO_DIR@/releases/portage/stages-qemu
+portage_prefix: releng
+interpreter: /usr/bin/qemu-m68k
diff --git a/tools/catalyst-auto-qemu-m68k.conf
b/tools/catalyst-auto-qemu-m68k.conf
index 7ac24ce5..7c4d4268 100644
--- a/tools/catalyst-auto-qemu-m68k.conf
+++ b/tools/catalyst-auto-qemu-m68k.conf
@@ -13,10 +13,12 @@ EMAIL_SUBJECT_PREPEND="[m68k-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
@@ -35,9 +37,19 @@ post_build() {
local set=$1 spec=$2
case ${spec} in
- stage3*.spec)
+ stage3-openrc.spec)
pushd "${BUILD_SRCDIR_BASE}/builds/default" >/dev/null
- upload stage3-m68k-$(echo ${spec}|sed -e
's:^stage3-::g' -e 's:\.spec$::g')-${TIMESTAMP}*.xz*
+ upload stage3-m68k-openrc-${TIMESTAMP}*.xz*
+ popd >/dev/null
+ ;;
+ stage3-systemd.spec)
+ pushd "${BUILD_SRCDIR_BASE}/builds/default" >/dev/null
+ upload stage3-m68k-systemd-${TIMESTAMP}*.xz*
+ popd >/dev/null
+ ;;
+ stage3-systemd-mu.spec)
+ pushd "${BUILD_SRCDIR_BASE}/builds/default" >/dev/null
+ upload stage3-m68k-systemd-mergedusr-${TIMESTAMP}*.xz*
popd >/dev/null
;;
*)
