[gentoo-commits] proj/releng:master commit in: tools/

[Andreas K. Hüttel]

commit:     a1b5b9afd080fff8d6e06091d1976803728c03e6
Author:     Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 14 22:23:33 2023 +0000
Commit:     Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Thu Dec 14 22:24:11 2023 +0000
URL:        https://gitweb.gentoo.org/proj/releng.git/commit/?id=a1b5b9af

Stop building arm64 systemd split-usr stages

Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>

 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