From 24d1bf2d94029cc25b89e085d1ebc445cc0f9407 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20K=2E=20H=C3=BCttel?= Date: Sat, 10 Feb 2024 16:36:05 +0100 Subject: [PATCH] Enable ppc(64) BE 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-ppc.conf | 55 ++++++++++++++++++++++++++++-------- 1 file changed, 43 insertions(+), 12 deletions(-) diff --git a/tools/catalyst-auto-ppc.conf b/tools/catalyst-auto-ppc.conf index 2e3e8236..956a502a 100644 --- a/tools/catalyst-auto-ppc.conf +++ b/tools/catalyst-auto-ppc.conf @@ -4,19 +4,44 @@ UPLOAD_USER=ppc UPLOAD_KEY=/root/.ssh/id_rsa SPECS_DIR=${REPO_DIR}/releases/specs/ppc - -SPECS="ppc32/stage1-openrc.spec ppc32/stage3-openrc.spec ppc64/stage1-openrc.spec ppc64/stage3-openrc.spec" -#SPECS="${SPECS} installcd-stage1.spec installcd-stage2-minimal.spec" -#SPECS="${SPECS} stage2-desktop.spec stage3-desktop.spec" -#SPECS="${SPECS} livecd-stage1.spec livecd-stage2.spec" - -OPTIONAL_SPECS="ppc32/installcd-stage1.spec ppc32/installcd-stage2-minimal.spec" -OPTIONAL_SPECS="${OPTIONAL_SPECS} ppc64/stage1-systemd-mu.spec ppc64/stage3-systemd-mu.spec" -OPTIONAL_SPECS="${OPTIONAL_SPECS} ppc64/stage1-musl-hardened-openrc.spec ppc64/stage3-musl-hardened-openrc.spec" +SETS=" + openrc + systemd_mu + musl_hardened + openrc_23 + systemd_23 + openrc_64 + systemd_mu_64 + musl_hardened_64 + openrc_64_23 + systemd_64_23 +" +# musl_hardened_23 +# musl_hardened_64_23 + +SET_openrc_SPECS="ppc32/stage1-openrc.spec ppc32/stage3-openrc.spec" +SET_openrc_OPTIONAL_SPECS="ppc32/installcd-stage1.spec ppc32/installcd-stage2-minimal.spec" + +SET_systemd_mu_SPECS="ppc32/stage1-systemd-mu.spec ppc32/stage3-systemd-mu.spec" + +SET_musl_hardened_SPECS="ppc32/stage1-musl-hardened-openrc.spec ppc32/stage3-musl-hardened-openrc.spec" + +SET_openrc_64_SPECS="ppc64/stage1-openrc.spec ppc64/stage3-openrc.spec" + +SET_systemd_mu_64_SPECS="ppc64/stage1-systemd-mu.spec ppc64/stage3-systemd-mu.spec" + +SET_musl_hardened_64_SPECS="ppc64/stage1-musl-hardened-openrc.spec ppc64/stage3-musl-hardened-openrc.spec" + +SET_openrc_23_SPECS="ppc32/stage1-openrc-23.spec ppc32/stage3-openrc-23.spec" + +SET_systemd_23_SPECS="ppc32/stage1-systemd-23.spec ppc32/stage3-systemd-23.spec" + +SET_openrc_64_23_SPECS="ppc64/stage1-openrc-23.spec ppc64/stage3-openrc-23.spec" + +SET_systemd_64_23_SPECS="ppc64/stage1-systemd-23.spec ppc64/stage3-systemd-23.spec" + -OPTIONAL_SPECS="${OPTIONAL_SPECS} ppc32/stage1-systemd-mu.spec ppc32/stage3-systemd-mu.spec" -OPTIONAL_SPECS="${OPTIONAL_SPECS} ppc32/stage1-musl-hardened-openrc.spec ppc32/stage3-musl-hardened-openrc.spec" KCONFIG_DIR=${REPO_DIR}/releases/kconfig/powerpc @@ -25,7 +50,7 @@ EMAIL_SUBJECT_PREPEND="[ppc-auto]" update_symlinks() { # Symlink the latest stages3 to build from local d f - for d in "${BUILD_SRCDIR_BASE}/builds"/{default,musl-hardened,mergedusr} ; do + for d in "${BUILD_SRCDIR_BASE}/builds"/* ; do mkdir -p "${d}" pushd "${d}" >/dev/null for f in $(ls stage3-ppc-*xz | grep -v latest | give_latest_from_dates) ; do @@ -71,6 +96,12 @@ post_build() { upload musl-hardened/stage3-ppc64-musl-hardened-openrc-*${TIMESTAMP}*.xz* upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/musl-hardened/stage3-ppc64" ppc/17.0/ppc64_musl_hardened ;; + ppc32/stage3-systemd-23.spec) + upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/23.0-default/stage3-ppc" ppc/23.0/ppc + ;; + ppc64/stage3-systemd-23.spec) + upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/23.0-default/stage3-ppc64" ppc/23.0/ppc64 + ;; *) echo "Finished ${spec}" ;;