From a1b5b9afd080fff8d6e06091d1976803728c03e6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20K=2E=20H=C3=BCttel?= Date: Thu, 14 Dec 2023 23:23:33 +0100 Subject: [PATCH] Stop building arm64 systemd split-usr stages 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 | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/tools/catalyst-auto-arm64.conf b/tools/catalyst-auto-arm64.conf index 55eb174b..0f152ca1 100644 --- a/tools/catalyst-auto-arm64.conf +++ b/tools/catalyst-auto-arm64.conf @@ -41,7 +41,7 @@ EMAIL_SUBJECT_PREPEND="[${SUBARCH}-auto]" update_symlinks() { # Symlink the latest stages3 to build from local d f - for d in "${BUILD_SRCDIR_BASE}/builds/default" "${BUILD_SRCDIR_BASE}/builds/mergedusr" "${BUILD_SRCDIR_BASE}/builds/llvm" "${BUILD_SRCDIR_BASE}/builds/llvm-mergedusr" "${BUILD_SRCDIR_BASE}/builds/musl" "${BUILD_SRCDIR_BASE}/builds/musl-hardened" "${BUILD_SRCDIR_BASE}/builds/musl-llvm"; do + for d in "${BUILD_SRCDIR_BASE}/builds"/* ; do mkdir -p "${d}" pushd "${d}" >/dev/null for f in $(ls stage3-${SUBARCH}-*xz | grep -v latest | give_latest_from_dates) ; do @@ -62,17 +62,11 @@ post_build() { ;; stage3-openrc.spec) upload stage3-${SUBARCH}-openrc-${TIMESTAMP}*.xz* + # do not upsync_binpackages, done by extra builder ;; stage3d-openrc.spec) upload stage3-${SUBARCH}-desktop-openrc-${TIMESTAMP}*.xz* ;; - stage3-systemd.spec) - upload stage3-${SUBARCH}-systemd-${TIMESTAMP}*.xz* - # do not upsync_binpackages, done by extra builder - ;; - stage3d-systemd.spec) - upload stage3-${SUBARCH}-desktop-systemd-${TIMESTAMP}*.xz* - ;; esac popd >/dev/null @@ -91,9 +85,6 @@ post_build() { case ${spec} in llvm/stage3-openrc.spec) upload stage3-${SUBARCH}-llvm-openrc-${TIMESTAMP}*.xz* - ;; - llvm/stage3-systemd.spec) - upload stage3-${SUBARCH}-llvm-systemd-${TIMESTAMP}*.xz* upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/llvm/stage3-arm64" arm64/17.0/arm64_llvm ;; esac