commit: 64a00207f3eac64f8371251434d52e3c96910f54
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 29 22:36:03 2022 +0000
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Thu Dec 29 22:36:30 2022 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=64a00207
Add amd64 desktop systemd mu stage
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
releases/specs/amd64/stage3d-systemd-mu.spec | 10 ++++++++++
tools/catalyst-auto-amd64.conf | 4 ++++
2 files changed, 14 insertions(+)
diff --git a/releases/specs/amd64/stage3d-systemd-mu.spec
b/releases/specs/amd64/stage3d-systemd-mu.spec
new file mode 100644
index 00000000..369e255e
--- /dev/null
+++ b/releases/specs/amd64/stage3d-systemd-mu.spec
@@ -0,0 +1,10 @@
+subarch: amd64
+target: stage3
+version_stamp: desktop-systemd-mergedusr-@TIMESTAMP@
+rel_type: mergedusr
+profile: default/linux/amd64/17.1/desktop/systemd/merged-usr
+snapshot: @TIMESTAMP@
+source_subpath: mergedusr/stage1-amd64-systemd-mergedusr-@TIMESTAMP@
+compression_mode: pixz
+portage_confdir: @REPO_DIR@/releases/portage/stages
+portage_prefix: releng
diff --git a/tools/catalyst-auto-amd64.conf b/tools/catalyst-auto-amd64.conf
index 544bc40d..478ed5ba 100644
--- a/tools/catalyst-auto-amd64.conf
+++ b/tools/catalyst-auto-amd64.conf
@@ -41,6 +41,7 @@ SET_systemd_SPECS="stage1-systemd.spec stage3-systemd.spec"
SET_systemd_OPTIONAL_SPECS="stage3d-systemd.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"
@@ -145,6 +146,9 @@ post_build() {
stage3-systemd-mu.spec)
upload stage3-amd64-systemd-mergedusr-${TIMESTAMP}.tar.xz*
;;
+ stage3d-systemd-mu.spec)
+ upload
stage3-amd64-desktop-systemd-mergedusr-${TIMESTAMP}.tar.xz*
+ ;;
nomultilib/stage3-systemd-mu.spec)
upload
stage3-amd64-nomultilib-systemd-mergedusr-${TIMESTAMP}.tar.xz*
;;
