| 1 |
commit: c6b013b2a1e4f755c7e74aaa4397a28a594af3e7 |
| 2 |
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Sep 10 18:53:27 2021 +0000 |
| 4 |
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Sep 10 18:53:27 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=c6b013b2 |
| 7 |
|
| 8 |
Also add arm64 musl-hardened |
| 9 |
|
| 10 |
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org> |
| 11 |
|
| 12 |
releases/specs/arm64/musl-hardened/stage1.spec | 13 +++++++++++++ |
| 13 |
releases/specs/arm64/musl-hardened/stage3.spec | 11 +++++++++++ |
| 14 |
tools/catalyst-auto-arm64.conf | 18 ++++++++++++++++-- |
| 15 |
3 files changed, 40 insertions(+), 2 deletions(-) |
| 16 |
|
| 17 |
diff --git a/releases/specs/arm64/musl-hardened/stage1.spec b/releases/specs/arm64/musl-hardened/stage1.spec |
| 18 |
new file mode 100644 |
| 19 |
index 00000000..a7b5e86d |
| 20 |
--- /dev/null |
| 21 |
+++ b/releases/specs/arm64/musl-hardened/stage1.spec |
| 22 |
@@ -0,0 +1,13 @@ |
| 23 |
+subarch: arm64 |
| 24 |
+target: stage1 |
| 25 |
+version_stamp: musl-hardened-@TIMESTAMP@ |
| 26 |
+rel_type: musl-hardened |
| 27 |
+profile: default/linux/arm64/17.0/musl/hardened |
| 28 |
+snapshot: @TIMESTAMP@ |
| 29 |
+source_subpath: musl-hardened/stage3-arm64-musl-hardened-latest |
| 30 |
+compression_mode: pixz_x |
| 31 |
+update_seed: yes |
| 32 |
+update_seed_command: --update --deep --jobs=5 --newuse --complete-graph @world |
| 33 |
+portage_confdir: @REPO_DIR@/releases/portage/stages-musl |
| 34 |
+portage_overlay: /root/musl |
| 35 |
+portage_prefix: releng |
| 36 |
|
| 37 |
diff --git a/releases/specs/arm64/musl-hardened/stage3.spec b/releases/specs/arm64/musl-hardened/stage3.spec |
| 38 |
new file mode 100644 |
| 39 |
index 00000000..550f7ba2 |
| 40 |
--- /dev/null |
| 41 |
+++ b/releases/specs/arm64/musl-hardened/stage3.spec |
| 42 |
@@ -0,0 +1,11 @@ |
| 43 |
+subarch: arm64 |
| 44 |
+target: stage3 |
| 45 |
+version_stamp: musl-hardened-@TIMESTAMP@ |
| 46 |
+rel_type: musl-hardened |
| 47 |
+profile: default/linux/arm64/17.0/musl/hardened |
| 48 |
+snapshot: @TIMESTAMP@ |
| 49 |
+source_subpath: musl-hardened/stage1-arm64-musl-hardened-@TIMESTAMP@ |
| 50 |
+compression_mode: pixz_x |
| 51 |
+portage_confdir: @REPO_DIR@/releases/portage/stages-musl |
| 52 |
+portage_overlay: /root/musl |
| 53 |
+portage_prefix: releng |
| 54 |
|
| 55 |
diff --git a/tools/catalyst-auto-arm64.conf b/tools/catalyst-auto-arm64.conf |
| 56 |
index f7d8d766..5bc9dde3 100644 |
| 57 |
--- a/tools/catalyst-auto-arm64.conf |
| 58 |
+++ b/tools/catalyst-auto-arm64.conf |
| 59 |
@@ -6,12 +6,13 @@ UPLOAD_KEY=/root/.ssh/id_ed25519 |
| 60 |
SPECS_DIR=${REPO_DIR}/releases/specs/arm64 |
| 61 |
SUBARCH=`grep subarch $SPECS_DIR/stage1.spec | awk '{print $2}'` |
| 62 |
|
| 63 |
-SETS="default musl" |
| 64 |
+SETS="default musl muslhardened" |
| 65 |
|
| 66 |
SET_default_SPECS="stage1.spec stage3.spec systemd-stage1.spec systemd-stage3.spec" |
| 67 |
SET_default_OPTIONAL_SPECS="installcd-stage1.spec installcd-stage2-minimal.spec" |
| 68 |
|
| 69 |
SET_musl_SPECS="musl/stage1.spec musl/stage3.spec" |
| 70 |
+SET_muslhardened_SPECS="musl-hardened/stage1.spec musl-hardened/stage3.spec" |
| 71 |
|
| 72 |
KCONFIG_DIR=${REPO_DIR}/releases/kconfig/arm64 |
| 73 |
|
| 74 |
@@ -20,7 +21,7 @@ EMAIL_SUBJECT_PREPEND="[${SUBARCH}-auto]" |
| 75 |
update_symlinks() { |
| 76 |
# Symlink the latest stages3 to build from |
| 77 |
local d f |
| 78 |
- for d in "${BUILD_SRCDIR_BASE}/builds/default" "${BUILD_SRCDIR_BASE}/builds/musl"; do |
| 79 |
+ for d in "${BUILD_SRCDIR_BASE}/builds/default" "${BUILD_SRCDIR_BASE}/builds/musl" "${BUILD_SRCDIR_BASE}/builds/musl-hardened"; do |
| 80 |
pushd "${d}" >/dev/null |
| 81 |
for f in $(ls stage3-${SUBARCH}-*xz | grep -v latest | give_latest_from_dates) ; do |
| 82 |
local of=$(echo "${f}" | convert_filename) |
| 83 |
@@ -64,4 +65,17 @@ post_build() { |
| 84 |
esac |
| 85 |
|
| 86 |
popd >/dev/null |
| 87 |
+ |
| 88 |
+ pushd "${BUILD_SRCDIR_BASE}/builds/musl-hardened" >/dev/null |
| 89 |
+ |
| 90 |
+ case ${spec} in |
| 91 |
+ musl-hardened/stage3.spec) |
| 92 |
+ upload stage3-${SUBARCH}-*${TIMESTAMP}*.tar.xz* |
| 93 |
+ ;; |
| 94 |
+ *) |
| 95 |
+ echo "Finished ${spec}" |
| 96 |
+ ;; |
| 97 |
+ esac |
| 98 |
+ |
| 99 |
+ popd >/dev/null |
| 100 |
} |
Archives