[gentoo-commits] proj/releng:master commit in: releases/specs/arm64/, tools/

["Andreas K. Hüttel" <dilfridge@gentoo.org>]

commit:     52f389d43a83b727d08cfd9447f04b5ed7235e05
Author:     Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 23 19:16:55 2022 +0000
Commit:     Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sun Jan 23 19:16:55 2022 +0000
URL:        https://gitweb.gentoo.org/proj/releng.git/commit/?id=52f389d4

arm64: add desktop stages

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

 releases/specs/arm64/stage3d-openrc.spec  | 10 ++++++++++
 releases/specs/arm64/stage3d-systemd.spec | 10 ++++++++++
 tools/catalyst-auto-arm64.conf            | 13 ++++++++++---
 3 files changed, 30 insertions(+), 3 deletions(-)

diff --git a/releases/specs/arm64/stage3d-openrc.spec b/releases/specs/arm64/stage3d-openrc.spec
new file mode 100644
index 00000000..680d9d43
--- /dev/null
+++ b/releases/specs/arm64/stage3d-openrc.spec
@@ -0,0 +1,10 @@
+subarch: arm64
+target: stage3
+version_stamp: desktop-openrc-@TIMESTAMP@
+rel_type: default
+profile: default/linux/arm64/17.0/desktop
+snapshot: @TIMESTAMP@
+source_subpath: default/stage1-arm64-openrc-@TIMESTAMP@
+compression_mode: pixz
+portage_confdir: @REPO_DIR@/releases/portage/stages
+portage_prefix: releng

diff --git a/releases/specs/arm64/stage3d-systemd.spec b/releases/specs/arm64/stage3d-systemd.spec
new file mode 100644
index 00000000..6deedc4b
--- /dev/null
+++ b/releases/specs/arm64/stage3d-systemd.spec
@@ -0,0 +1,10 @@
+subarch: arm64
+target: stage3
+version_stamp: desktop-systemd-@TIMESTAMP@
+rel_type: default
+profile: default/linux/arm64/17.0/desktop/systemd
+snapshot: @TIMESTAMP@
+source_subpath: default/stage1-arm64-systemd-@TIMESTAMP@
+compression_mode: pixz
+portage_confdir: @REPO_DIR@/releases/portage/stages
+portage_prefix: releng

diff --git a/tools/catalyst-auto-arm64.conf b/tools/catalyst-auto-arm64.conf
index 0e32bc43..d9d0c37f 100644
--- a/tools/catalyst-auto-arm64.conf
+++ b/tools/catalyst-auto-arm64.conf
@@ -6,10 +6,11 @@ UPLOAD_KEY=/root/.ssh/id_ed25519
 SPECS_DIR=${REPO_DIR}/releases/specs/arm64
 SUBARCH=`grep subarch $SPECS_DIR/stage1.spec | awk '{print $2}'`
 
-SETS="musl muslhardened default"
+SETS="openrc systemd musl muslhardened"
 
-SET_default_SPECS="stage1-openrc.spec stage3-openrc.spec stage1-systemd.spec stage3-systemd.spec"
-SET_default_OPTIONAL_SPECS="installcd-stage1.spec installcd-stage2-minimal.spec"
+SET_openrc_SPECS="stage1-openrc.spec stage3-openrc.spec stage3d-openrc.spec"
+SET_openrc_OPTIONAL_SPECS="installcd-stage1.spec installcd-stage2-minimal.spec"
+SET_systemd_SPECS="stage1-systemd.spec stage3-systemd.spec stage3d-systemd.spec"
 
 SET_musl_SPECS="musl/stage1.spec musl/stage3.spec"
 SET_muslhardened_SPECS="musl-hardened/stage1.spec musl-hardened/stage3.spec"
@@ -43,9 +44,15 @@ post_build() {
 	stage3-openrc.spec)
 		upload stage3-${SUBARCH}-openrc-${TIMESTAMP}*.xz*
 		;;
+	stage3d-openrc.spec)
+		upload stage3-${SUBARCH}-desktop-openrc-${TIMESTAMP}*.xz*
+		;;
 	stage3-systemd.spec)
 		upload stage3-${SUBARCH}-systemd-${TIMESTAMP}*.xz*
 		;;
+	stage3d-systemd.spec)
+		upload stage3-${SUBARCH}-desktop-systemd-${TIMESTAMP}*.xz*
+		;;
 	*)
 		echo "Finished ${spec}"
 		;;