From 64fa328a3f38b51c702a01a56fffd65c46180a48 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20K=2E=20H=C3=BCttel?= Date: Fri, 15 Dec 2023 22:27:32 +0100 Subject: [PATCH] Enable arm64 23.0 profile 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-arm64.conf | 53 ++++++++++++++++++++++++++++++++++ 1 file changed, 53 insertions(+) diff --git a/tools/catalyst-auto-arm64.conf b/tools/catalyst-auto-arm64.conf index baba95af..61c7d67f 100644 --- a/tools/catalyst-auto-arm64.conf +++ b/tools/catalyst-auto-arm64.conf @@ -14,6 +14,13 @@ SETS=" musl musl_hardened musl_llvm + openrc_23 + systemd_23 + llvm_openrc_23 + llvm_systemd_23 + musl_23 + musl_hardened_23 + musl_llvm_23 " SET_openrc_SPECS="stage1-openrc.spec stage3-openrc.spec stage3d-openrc.spec" @@ -21,16 +28,30 @@ SET_openrc_OPTIONAL_SPECS="installcd-stage1.spec installcd-stage2-minimal.spec" SET_systemd_mu_SPECS="stage1-systemd-mu.spec stage3-systemd-mu.spec stage3d-systemd-mu.spec" +SET_openrc_23_SPECS="stage1-openrc-23.spec stage3-openrc-23.spec stage3d-openrc-23.spec" + +SET_systemd_23_SPECS="stage1-systemd-23.spec stage3-systemd-23.spec stage3d-systemd-23.spec" + SET_llvm_openrc_SPECS="llvm/stage1-openrc.spec llvm/stage3-openrc.spec" SET_llvm_systemd_mu_SPECS="llvm/stage1-systemd-mu.spec llvm/stage3-systemd-mu.spec" +SET_llvm_openrc_23_SPECS="llvm/stage1-openrc-23.spec llvm/stage3-openrc-23.spec" + +SET_llvm_systemd_23_SPECS="llvm/stage1-systemd-23.spec llvm/stage3-systemd-23.spec" + SET_musl_SPECS="musl/stage1.spec musl/stage3.spec" SET_musl_hardened_SPECS="musl-hardened/stage1.spec musl-hardened/stage3.spec" SET_musl_llvm_SPECS="musl-llvm/stage1.spec musl-llvm/stage3.spec" +SET_musl_23_SPECS="musl/stage1-23.spec musl/stage3-23.spec" + +SET_musl_hardened_23_SPECS="musl-hardened/stage1-23.spec musl-hardened/stage3-23.spec" + +SET_musl_llvm_23_SPECS="musl-llvm/stage1-23.spec musl-llvm/stage3-23.spec" + KCONFIG_DIR=${REPO_DIR}/releases/kconfig/arm64 @@ -88,6 +109,14 @@ post_build() { esac popd >/dev/null + pushd "${BUILD_SRCDIR_BASE}/builds/23.0-llvm" >/dev/null + case ${spec} in + llvm/stage3-systemd-23.spec) + upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/23.0-llvm/stage3-arm64" arm64/23.0/arm64_llvm + ;; + esac + popd >/dev/null + pushd "${BUILD_SRCDIR_BASE}/builds/llvm-mergedusr" >/dev/null case ${spec} in llvm/stage3-systemd-mu.spec) @@ -105,6 +134,14 @@ post_build() { esac popd >/dev/null + pushd "${BUILD_SRCDIR_BASE}/builds/23.0-musl" >/dev/null + case ${spec} in + musl/stage3-23.spec) + upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/23.0-musl/stage3-arm64" arm64/23.0/arm64_musl + ;; + esac + popd >/dev/null + pushd "${BUILD_SRCDIR_BASE}/builds/musl-hardened" >/dev/null case ${spec} in musl-hardened/stage3.spec) @@ -114,6 +151,14 @@ post_build() { esac popd >/dev/null + pushd "${BUILD_SRCDIR_BASE}/builds/23.0-musl-hardened" >/dev/null + case ${spec} in + musl-hardened/stage3-23.spec) + upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/23.0-musl-hardened/stage3-arm64" arm64/23.0/arm64_musl_hardened + ;; + esac + popd >/dev/null + pushd "${BUILD_SRCDIR_BASE}/builds/musl-llvm" >/dev/null case ${spec} in musl-llvm/stage3.spec) @@ -122,4 +167,12 @@ post_build() { ;; esac popd >/dev/null + + pushd "${BUILD_SRCDIR_BASE}/builds/23.0-musl-llvm" >/dev/null + case ${spec} in + musl-llvm/stage3-23.spec) + upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/23.0-musl-llvm/stage3-arm64" arm64/23.0/arm64_musl_llvm + ;; + esac + popd >/dev/null }