From 0c270e053876525716cf6a6391385ea4aab79920 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20K=2E=20H=C3=BCttel?= Date: Fri, 8 Mar 2024 00:37:43 +0100 Subject: [PATCH] Enable arm 23.0 musl builds MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Andreas K. Hüttel --- tools/catalyst-auto-arm.conf | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/tools/catalyst-auto-arm.conf b/tools/catalyst-auto-arm.conf index e8dd56e2..37a590fe 100644 --- a/tools/catalyst-auto-arm.conf +++ b/tools/catalyst-auto-arm.conf @@ -35,10 +35,14 @@ SETS=" armv6j_hf_systemd_23 armv6j_sf_openrc_23 armv6j_sf_systemd_23 + armv6j_hf_musl_openrc_23 + armv6j_hf_musl_hardened_openrc_23 armv7a_hf_openrc_23 armv7a_hf_systemd_23 armv7a_sf_openrc_23 armv7a_sf_systemd_23 + armv7a_hf_musl_openrc_23 + armv7a_hf_musl_hardened_openrc_23 " SET_armv4tl_openrc_SPECS="armv4tl/stage1-openrc.spec armv4tl/stage3-openrc.spec" @@ -77,12 +81,18 @@ SET_armv6j_hf_systemd_23_SPECS="armv6j/stage1-hardfloat-systemd-23.spec armv6j/s SET_armv6j_sf_openrc_23_SPECS="armv6j/stage1-openrc-23.spec armv6j/stage3-openrc-23.spec" SET_armv6j_sf_systemd_23_SPECS="armv6j/stage1-systemd-23.spec armv6j/stage3-systemd-23.spec" +SET_armv6j_hf_musl_openrc_23_SPECS="armv6j-musl/stage1-hardfloat-23.spec armv6j-musl/stage3-hardfloat-23.spec" +SET_armv6j_hf_musl_hardened_openrc_23_SPECS="armv6j-musl-hardened/stage1-hardfloat-23.spec armv6j-musl-hardened/stage3-hardfloat-23.spec" + SET_armv7a_hf_openrc_23_SPECS="armv7a/stage1-hardfloat-openrc-23.spec armv7a/stage3-hardfloat-openrc-23.spec" SET_armv7a_hf_systemd_23_SPECS="armv7a/stage1-hardfloat-systemd-23.spec armv7a/stage3-hardfloat-systemd-23.spec" SET_armv7a_sf_openrc_23_SPECS="armv7a/stage1-openrc-23.spec armv7a/stage3-openrc-23.spec" SET_armv7a_sf_systemd_23_SPECS="armv7a/stage1-systemd-23.spec armv7a/stage3-systemd-23.spec" +SET_armv7a_hf_musl_openrc_23_SPECS="armv7a-musl/stage1-hardfloat-23.spec armv7a-musl/stage3-hardfloat-23.spec" +SET_armv7a_hf_musl_hardened_openrc_23_SPECS="armv7a-musl-hardened/stage1-hardfloat-23.spec armv7a-musl-hardened/stage3-hardfloat-23.spec" + update_symlinks() { # Symlink the latest stages3 to build from @@ -172,6 +182,19 @@ post_build() { popd >/dev/null + pushd "${BUILD_SRCDIR_BASE}/builds/23.0-musl" >/dev/null + + case ${spec} in + armv7a-musl/stage3-hardfloat-23.spec) + upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/23.0-musl/stage3-armv7a_hardfp_musl" arm/23.0/armv7a_hardfp_musl + ;; + armv6j-musl/stage3-hardfloat-23.spec) + upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/23.0-musl/stage3-armv6j_hardfp_musl" arm/23.0/armv6j_hardfp_musl + ;; + esac + + popd >/dev/null + pushd "${BUILD_SRCDIR_BASE}/builds/musl-hardened" >/dev/null case ${spec} in @@ -187,6 +210,19 @@ post_build() { popd >/dev/null + pushd "${BUILD_SRCDIR_BASE}/builds/23.0-musl-hardened" >/dev/null + + case ${spec} in + armv7a-musl-hardened/stage3-hardfloat-23.spec) + upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/23.0-musl-hardened/stage3-armv7a_hardfp_musl" arm/23.0/armv7a_hardfp_musl_hardened + ;; + armv6j-musl-hardened/stage3-hardfloat-23.spec) + upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/23.0-musl-hardened/stage3-armv6j_hardfp_musl" arm/23.0/armv6j_hardfp_musl_hardened + ;; + esac + + popd >/dev/null + pushd "${BUILD_SRCDIR_BASE}/builds/23.0-default" >/dev/null case ${spec} in