From d1052880b98707f7b1de9843b1ea4b0380b3f4c2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20K=2E=20H=C3=BCttel?= Date: Sun, 28 Jan 2024 01:58:20 +0100 Subject: [PATCH] sparc: Enable 23.0 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-sparc64.conf | 37 ++++++++++++++++++++++++++++++-- 1 file changed, 35 insertions(+), 2 deletions(-) diff --git a/tools/catalyst-auto-sparc64.conf b/tools/catalyst-auto-sparc64.conf index 3d1c6f79..24330c68 100644 --- a/tools/catalyst-auto-sparc64.conf +++ b/tools/catalyst-auto-sparc64.conf @@ -5,8 +5,30 @@ UPLOAD_USER=sparc UPLOAD_KEY=/root/.ssh/id_ed25519 SPECS_DIR=${REPO_DIR}/releases/specs/sparc -SPECS="sparc/stage1.spec sparc/stage3.spec sparc/systemd-stage1-mu.spec sparc/systemd-stage3-mu.spec sparc64/stage1.spec sparc64/stage3.spec sparc64/systemd-stage1-mu.spec sparc64/systemd-stage3-mu.spec" -OPTIONAL_SPECS="sparc64/installcd-stage1.spec sparc64/installcd-stage2-minimal.spec" +SETS=" + openrc_32 + systemd_32_mu + openrc_32_23 + systemd_32_23 + openrc_64 + systemd_64_mu + openrc_64_23 + systemd_64_23 +" + +SET_openrc_32_SPECS="sparc/stage1.spec sparc/stage3.spec" +SET_systemd_32_mu_SPECS="sparc/systemd-stage1-mu.spec sparc/systemd-stage3-mu.spec" + +SET_openrc_64_SPECS="sparc64/stage1.spec sparc64/stage3.spec" +SET_openrc_64_OPTIONAL_SPECS="sparc64/installcd-stage1.spec sparc64/installcd-stage2-minimal.spec" +SET_systemd_64_mu_SPECS="sparc64/systemd-stage1-mu.spec sparc64/systemd-stage3-mu.spec" + +SET_openrc_32_23_SPECS="sparc/stage1-openrc-23.spec sparc/stage3-openrc-23.spec" +SET_systemd_32_23_SPECS="sparc/stage1-systemd-23.spec sparc/stage3-systemd-23.spec" + +SET_openrc_64_23_SPECS="sparc64/stage1-openrc-23.spec sparc64/stage3-openrc-23.spec" +SET_systemd_64_23_SPECS="sparc64/stage1-systemd-23.spec sparc64/stage3-systemd-23.spec" + KCONFIG_DIR=${REPO_DIR}/releases/kconfig/sparc @@ -49,6 +71,17 @@ post_build() { esac popd >/dev/null + pushd "${BUILD_SRCDIR_BASE}/builds/23.0-default" >/dev/null + case ${spec} in + sparc/stage3-systemd-23.spec) + upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/23.0-default/stage3-sparc" sparc/23.0/32 + ;; + sparc64/stage3-systemd-23.spec) + upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/23.0-default/stage3-sparc64" sparc/23.0/64 + ;; + esac + popd >/dev/null + pushd "${BUILD_SRCDIR_BASE}/builds/mergedusr" >/dev/null case ${spec} in sparc/systemd-stage3-mu.spec)