From d766a0a42e586f06abc1819d99db3681f295e68b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20K=2E=20H=C3=BCttel?= Date: Sun, 21 Nov 2021 13:59:37 +0100 Subject: [PATCH] Add armv6j and armv7a hf musl-hardened autobuilds MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Andreas K. Hüttel --- .../stage1-hardfloat.spec | 13 ++++++++++++ .../stage3-hardfloat.spec | 11 ++++++++++ .../stage1-hardfloat.spec | 13 ++++++++++++ .../stage3-hardfloat.spec | 11 ++++++++++ tools/catalyst-auto-arm.conf | 21 +++++++++++++++++-- 5 files changed, 67 insertions(+), 2 deletions(-) create mode 100644 releases/specs/arm/armv6j-musl-hardened/stage1-hardfloat.spec create mode 100644 releases/specs/arm/armv6j-musl-hardened/stage3-hardfloat.spec create mode 100644 releases/specs/arm/armv7a-musl-hardened/stage1-hardfloat.spec create mode 100644 releases/specs/arm/armv7a-musl-hardened/stage3-hardfloat.spec diff --git a/releases/specs/arm/armv6j-musl-hardened/stage1-hardfloat.spec b/releases/specs/arm/armv6j-musl-hardened/stage1-hardfloat.spec new file mode 100644 index 00000000..75ebdf80 --- /dev/null +++ b/releases/specs/arm/armv6j-musl-hardened/stage1-hardfloat.spec @@ -0,0 +1,13 @@ +subarch: armv6j_hardfp_musl +version_stamp: hardened-openrc-@TIMESTAMP@ +target: stage1 +rel_type: musl-hardened +profile: default/linux/arm/17.0/musl/armv6j/hardened +snapshot: @TIMESTAMP@ +source_subpath: musl/stage3-armv6j_hardfp_musl-hardened-openrc-latest +compression_mode: pixz +update_seed: yes +update_seed_command: -uDN @world +portage_confdir: @REPO_DIR@/releases/portage/stages +portage_prefix: releng +repos: /root/musl diff --git a/releases/specs/arm/armv6j-musl-hardened/stage3-hardfloat.spec b/releases/specs/arm/armv6j-musl-hardened/stage3-hardfloat.spec new file mode 100644 index 00000000..9671a89b --- /dev/null +++ b/releases/specs/arm/armv6j-musl-hardened/stage3-hardfloat.spec @@ -0,0 +1,11 @@ +subarch: armv6j_hardfp_musl +version_stamp: hardened-openrc-@TIMESTAMP@ +target: stage3 +rel_type: musl-hardened +profile: default/linux/arm/17.0/musl/armv6j/hardened +snapshot: @TIMESTAMP@ +source_subpath: musl/stage1-armv6j_hardfp_musl-hardened-openrc-@TIMESTAMP@ +compression_mode: pixz +portage_confdir: @REPO_DIR@/releases/portage/stages +portage_prefix: releng +repos: /root/musl diff --git a/releases/specs/arm/armv7a-musl-hardened/stage1-hardfloat.spec b/releases/specs/arm/armv7a-musl-hardened/stage1-hardfloat.spec new file mode 100644 index 00000000..ddb3ff4a --- /dev/null +++ b/releases/specs/arm/armv7a-musl-hardened/stage1-hardfloat.spec @@ -0,0 +1,13 @@ +subarch: armv7a_hardfp_musl +version_stamp: hardened-openrc-@TIMESTAMP@ +target: stage1 +rel_type: musl-hardened +profile: default/linux/arm/17.0/musl/armv7a/hardened +snapshot: @TIMESTAMP@ +source_subpath: musl/stage3-armv7a_hardfp_musl-hardened-openrc-latest +compression_mode: pixz +update_seed: yes +update_seed_command: -uDN @world +portage_confdir: @REPO_DIR@/releases/portage/stages +portage_prefix: releng +repos: /root/musl diff --git a/releases/specs/arm/armv7a-musl-hardened/stage3-hardfloat.spec b/releases/specs/arm/armv7a-musl-hardened/stage3-hardfloat.spec new file mode 100644 index 00000000..7ab7fe2d --- /dev/null +++ b/releases/specs/arm/armv7a-musl-hardened/stage3-hardfloat.spec @@ -0,0 +1,11 @@ +subarch: armv7a_hardfp_musl +version_stamp: hardened-openrc-@TIMESTAMP@ +target: stage3 +rel_type: musl-hardened +profile: default/linux/arm/17.0/musl/armv7a/hardened +snapshot: @TIMESTAMP@ +source_subpath: musl/stage1-armv7a_hardfp_musl-hardened-openrc-@TIMESTAMP@ +compression_mode: pixz +portage_confdir: @REPO_DIR@/releases/portage/stages +portage_prefix: releng +repos: /root/musl diff --git a/tools/catalyst-auto-arm.conf b/tools/catalyst-auto-arm.conf index 8c92df96..547c4a35 100644 --- a/tools/catalyst-auto-arm.conf +++ b/tools/catalyst-auto-arm.conf @@ -11,8 +11,10 @@ SPECS_DIR=${REPO_DIR}/releases/specs/arm EMAIL_SUBJECT_PREPEND="[arm-auto]" SETS=" + armv6j_hf_musl_hardened_openrc + armv7a_hf_musl_hardened_openrc armv6j_hf_musl_openrc - armv7a_hf_musl + armv7a_hf_musl_openrc armv4tl_openrc armv4tl_systemd armv5tel_openrc @@ -40,11 +42,13 @@ SET_armv6j_sf_openrc_SPECS="armv6j/stage1-openrc.spec armv6j/stage3-openrc.spec" SET_armv6j_sf_systemd_SPECS="armv6j/stage1-systemd.spec armv6j/stage3-systemd.spec" SET_armv6j_hf_musl_openrc_SPECS="armv6j-musl/stage1-hardfloat.spec armv6j-musl/stage3-hardfloat.spec" +SET_armv6j_hf_musl_hardened_openrc_SPECS="armv6j-musl-hardened/stage1-hardfloat.spec armv6j-musl-hardened/stage3-hardfloat.spec" SET_armv7a_hf_openrc_SPECS="armv7a/stage1-hardfloat-openrc.spec armv7a/stage3-hardfloat-openrc.spec" SET_armv7a_hf_systemd_SPECS="armv7a/stage1-hardfloat-systemd.spec armv7a/stage3-hardfloat-systemd.spec" -SET_armv7a_hf_musl_SPECS="armv7a-musl/stage1-hardfloat.spec armv7a-musl/stage3-hardfloat.spec" +SET_armv7a_hf_musl_openrc_SPECS="armv7a-musl/stage1-hardfloat.spec armv7a-musl/stage3-hardfloat.spec" +SET_armv7a_hf_musl_hardened_openrc_SPECS="armv7a-musl-hardened/stage1-hardfloat.spec armv7a-musl-hardened/stage3-hardfloat.spec" SET_armv7a_sf_openrc_SPECS="armv7a/stage1-openrc.spec armv7a/stage3-openrc.spec" SET_armv7a_sf_systemd_SPECS="armv7a/stage1-systemd.spec armv7a/stage3-systemd.spec" @@ -123,4 +127,17 @@ post_build() { esac popd >/dev/null + + pushd "${BUILD_SRCDIR_BASE}/builds/musl-hardened" >/dev/null + + case ${spec} in + armv7a-musl-hardened/stage3-hardfloat.spec) + upload stage3-armv7a_hardfp_musl-hardened-openrc-${TIMESTAMP}*.xz* + ;; + armv6j-musl-hardened/stage3-hardfloat.spec) + upload stage3-armv6j_hardfp_musl-hardened-openrc-${TIMESTAMP}*.xz* + ;; + esac + + popd >/dev/null }