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

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

[Andreas K. Hüttel]

commit:     c6b013b2a1e4f755c7e74aaa4397a28a594af3e7
Author:     Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Fri Sep 10 18:53:27 2021 +0000
Commit:     Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Fri Sep 10 18:53:27 2021 +0000
URL:        https://gitweb.gentoo.org/proj/releng.git/commit/?id=c6b013b2

Also add arm64 musl-hardened

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

 releases/specs/arm64/musl-hardened/stage1.spec | 13 +++++++++++++
 releases/specs/arm64/musl-hardened/stage3.spec | 11 +++++++++++
 tools/catalyst-auto-arm64.conf                 | 18 ++++++++++++++++--
 3 files changed, 40 insertions(+), 2 deletions(-)

diff --git a/releases/specs/arm64/musl-hardened/stage1.spec b/releases/specs/arm64/musl-hardened/stage1.spec
new file mode 100644
index 00000000..a7b5e86d
--- /dev/null
+++ b/releases/specs/arm64/musl-hardened/stage1.spec
@@ -0,0 +1,13 @@
+subarch: arm64
+target: stage1
+version_stamp: musl-hardened-@TIMESTAMP@
+rel_type: musl-hardened
+profile: default/linux/arm64/17.0/musl/hardened
+snapshot: @TIMESTAMP@
+source_subpath: musl-hardened/stage3-arm64-musl-hardened-latest
+compression_mode: pixz_x
+update_seed: yes
+update_seed_command: --update --deep --jobs=5 --newuse --complete-graph @world
+portage_confdir: @REPO_DIR@/releases/portage/stages-musl
+portage_overlay: /root/musl
+portage_prefix: releng

diff --git a/releases/specs/arm64/musl-hardened/stage3.spec b/releases/specs/arm64/musl-hardened/stage3.spec
new file mode 100644
index 00000000..550f7ba2
--- /dev/null
+++ b/releases/specs/arm64/musl-hardened/stage3.spec
@@ -0,0 +1,11 @@
+subarch: arm64
+target: stage3
+version_stamp: musl-hardened-@TIMESTAMP@
+rel_type: musl-hardened
+profile: default/linux/arm64/17.0/musl/hardened
+snapshot: @TIMESTAMP@
+source_subpath: musl-hardened/stage1-arm64-musl-hardened-@TIMESTAMP@
+compression_mode: pixz_x
+portage_confdir: @REPO_DIR@/releases/portage/stages-musl
+portage_overlay: /root/musl
+portage_prefix: releng

diff --git a/tools/catalyst-auto-arm64.conf b/tools/catalyst-auto-arm64.conf
index f7d8d766..5bc9dde3 100644
--- a/tools/catalyst-auto-arm64.conf
+++ b/tools/catalyst-auto-arm64.conf
@@ -6,12 +6,13 @@ UPLOAD_KEY=/root/.ssh/id_ed25519
 SPECS_DIR=${REPO_DIR}/releases/specs/arm64
 SUBARCH=`grep subarch $SPECS_DIR/stage1.spec | awk '{print $2}'`
 
-SETS="default musl"
+SETS="default musl muslhardened"
 
 SET_default_SPECS="stage1.spec stage3.spec systemd-stage1.spec systemd-stage3.spec"
 SET_default_OPTIONAL_SPECS="installcd-stage1.spec installcd-stage2-minimal.spec"
 
 SET_musl_SPECS="musl/stage1.spec musl/stage3.spec"
+SET_muslhardened_SPECS="musl-hardened/stage1.spec musl-hardened/stage3.spec"
 
 KCONFIG_DIR=${REPO_DIR}/releases/kconfig/arm64
 
@@ -20,7 +21,7 @@ EMAIL_SUBJECT_PREPEND="[${SUBARCH}-auto]"
 update_symlinks() {
 	# Symlink the latest stages3 to build from
 	local d f
-	for d in "${BUILD_SRCDIR_BASE}/builds/default" "${BUILD_SRCDIR_BASE}/builds/musl"; do
+	for d in "${BUILD_SRCDIR_BASE}/builds/default" "${BUILD_SRCDIR_BASE}/builds/musl" "${BUILD_SRCDIR_BASE}/builds/musl-hardened"; do
 		pushd "${d}" >/dev/null
 		for f in $(ls stage3-${SUBARCH}-*xz | grep -v latest | give_latest_from_dates) ; do
 			local of=$(echo "${f}" | convert_filename)
@@ -64,4 +65,17 @@ post_build() {
 	esac
 
 	popd >/dev/null
+
+	pushd "${BUILD_SRCDIR_BASE}/builds/musl-hardened" >/dev/null
+
+	case ${spec} in
+	musl-hardened/stage3.spec)
+		upload stage3-${SUBARCH}-*${TIMESTAMP}*.tar.xz*
+		;;
+	*)
+		echo "Finished ${spec}"
+		;;
+	esac
+
+	popd >/dev/null
 }