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

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

[Andreas K. Hüttel]

commit:     49e914aaa4080377eabf92f73a2e1d979383db3f
Author:     Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 16 20:51:22 2022 +0000
Commit:     Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Wed Nov 16 20:51:22 2022 +0000
URL:        https://gitweb.gentoo.org/proj/releng.git/commit/?id=49e914aa

Add arm64 systemd merged-usr build

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

 releases/specs/arm64/llvm/stage1-systemd-mu.spec | 12 ++++++++++++
 releases/specs/arm64/llvm/stage3-systemd-mu.spec | 10 ++++++++++
 releases/specs/arm64/stage1-systemd-mu.spec      | 12 ++++++++++++
 releases/specs/arm64/stage3-systemd-mu.spec      | 10 ++++++++++
 tools/catalyst-auto-arm64.conf                   | 12 +++++++++++-
 5 files changed, 55 insertions(+), 1 deletion(-)

diff --git a/releases/specs/arm64/llvm/stage1-systemd-mu.spec b/releases/specs/arm64/llvm/stage1-systemd-mu.spec
new file mode 100644
index 00000000..e4964445
--- /dev/null
+++ b/releases/specs/arm64/llvm/stage1-systemd-mu.spec
@@ -0,0 +1,12 @@
+subarch: arm64
+target: stage1
+version_stamp: llvm-systemd-mergedusr-@TIMESTAMP@
+rel_type: llvm
+profile: default/linux/arm64/17.0/systemd/llvm/merged-usr
+snapshot: @TIMESTAMP@
+source_subpath: llvm/stage3-arm64-llvm-systemd-mergedusr-latest.tar.xz
+compression_mode: pixz
+update_seed: no
+update_seed_command: --update --deep --jobs=5 --newuse --complete-graph @world
+portage_confdir: @REPO_DIR@/releases/portage/stages
+portage_prefix: releng

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

diff --git a/releases/specs/arm64/stage1-systemd-mu.spec b/releases/specs/arm64/stage1-systemd-mu.spec
new file mode 100644
index 00000000..5ad0107d
--- /dev/null
+++ b/releases/specs/arm64/stage1-systemd-mu.spec
@@ -0,0 +1,12 @@
+subarch: arm64
+target: stage1
+version_stamp: systemd-mergedusr-@TIMESTAMP@
+rel_type: default
+profile: default/linux/arm64/17.0/systemd/merged-usr
+snapshot: @TIMESTAMP@
+source_subpath: default/stage3-arm64-systemd-mergedusr-latest.tar.xz
+compression_mode: pixz
+update_seed: no
+update_seed_command: --update --deep --jobs=5 --newuse --complete-graph @world
+portage_confdir: @REPO_DIR@/releases/portage/stages
+portage_prefix: releng

diff --git a/releases/specs/arm64/stage3-systemd-mu.spec b/releases/specs/arm64/stage3-systemd-mu.spec
new file mode 100644
index 00000000..a7baf7b7
--- /dev/null
+++ b/releases/specs/arm64/stage3-systemd-mu.spec
@@ -0,0 +1,10 @@
+subarch: arm64
+target: stage3
+version_stamp: systemd-mergedusr-@TIMESTAMP@
+rel_type: default
+profile: default/linux/arm64/17.0/systemd/merged-usr
+snapshot: @TIMESTAMP@
+source_subpath: default/stage1-arm64-systemd-mergedusr-@TIMESTAMP@.tar.xz
+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 86add3b6..558fd6ae 100644
--- a/tools/catalyst-auto-arm64.conf
+++ b/tools/catalyst-auto-arm64.conf
@@ -6,14 +6,18 @@ UPLOAD_KEY=/root/.ssh/id_ed25519
 SPECS_DIR=${REPO_DIR}/releases/specs/arm64
 SUBARCH=arm64
 
-SETS="openrc llvmopenrc systemd llvmsystemd musl muslhardened muslllvm"
+SETS="openrc llvmopenrc systemd systemd_mu llvmsystemd llvmsystemd_mu musl muslhardened muslllvm"
 
 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_systemd_mu_SPECS="stage1-systemd-mu.spec stage3-systemd-mu.spec"
 
 SET_llvmopenrc_SPECS="llvm/stage1-openrc.spec llvm/stage3-openrc.spec"
+
 SET_llvmsystemd_SPECS="llvm/stage1-systemd.spec llvm/stage3-systemd.spec"
+SET_llvmsystemd_mu_SPECS="llvm/stage1-systemd-mu.spec llvm/stage3-systemd-mu.spec"
 
 SET_musl_SPECS="musl/stage1.spec musl/stage3.spec"
 SET_muslhardened_SPECS="musl-hardened/stage1.spec musl-hardened/stage3.spec"
@@ -58,6 +62,9 @@ post_build() {
 	stage3d-systemd.spec)
 		upload stage3-${SUBARCH}-desktop-systemd-${TIMESTAMP}*.xz*
 		;;
+	stage3-systemd-mu.spec)
+		upload stage3-${SUBARCH}-systemd-mergedusr-${TIMESTAMP}*.xz*
+		;;
 	*)
 		echo "Finished ${spec}"
 		;;
@@ -74,6 +81,9 @@ post_build() {
 	llvm/stage3-systemd.spec)
 		upload stage3-${SUBARCH}-llvm-systemd-${TIMESTAMP}*.xz*
 		;;
+	llvm/stage3-systemd-mu.spec)
+		upload stage3-${SUBARCH}-llvm-systemd-mergedusr-${TIMESTAMP}*.xz*
+		;;
 	*)
 		echo "Finished ${spec}"
 		;;