From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id B9ADF158013 for ; Thu, 14 Dec 2023 22:28:52 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D62A22BC01A; Thu, 14 Dec 2023 22:28:51 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id B90442BC01A for ; Thu, 14 Dec 2023 22:28:51 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id C7D1333BE19 for ; Thu, 14 Dec 2023 22:28:50 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 6B765123C for ; Thu, 14 Dec 2023 22:28:49 +0000 (UTC) From: "Andreas K. Hüttel" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas K. Hüttel" Message-ID: <1702592815.6255fc3365c4591b0962ccda8e296892acc4dbf4.dilfridge@gentoo> Subject: [gentoo-commits] proj/releng:master commit in: tools/ X-VCS-Repository: proj/releng X-VCS-Files: tools/catalyst-auto-amd64.conf X-VCS-Directories: tools/ X-VCS-Committer: dilfridge X-VCS-Committer-Name: Andreas K. Hüttel X-VCS-Revision: 6255fc3365c4591b0962ccda8e296892acc4dbf4 X-VCS-Branch: master Date: Thu, 14 Dec 2023 22:28:49 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 42886c45-c74d-4253-803e-467f7de4bd51 X-Archives-Hash: 04ee8c6738fd47084d06c3941dcfeafd commit: 6255fc3365c4591b0962ccda8e296892acc4dbf4 Author: Andreas K. Hüttel gentoo org> AuthorDate: Thu Dec 14 22:19:30 2023 +0000 Commit: Andreas K. Hüttel gentoo org> CommitDate: Thu Dec 14 22:26:55 2023 +0000 URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=6255fc33 Stop building and uploading amd64 systemd split-usr stages Signed-off-by: Andreas K. Hüttel gentoo.org> tools/catalyst-auto-amd64.conf | 32 +------------------------------- 1 file changed, 1 insertion(+), 31 deletions(-) diff --git a/tools/catalyst-auto-amd64.conf b/tools/catalyst-auto-amd64.conf index 4fbce5bf..f1da137f 100644 --- a/tools/catalyst-auto-amd64.conf +++ b/tools/catalyst-auto-amd64.conf @@ -11,14 +11,11 @@ SPECS_DIR=${REPO_DIR}/releases/specs/amd64 SETS=" openrc - systemd systemd_mu livegui nomultilib_openrc - nomultilib_systemd nomultilib_systemd_mu llvm_openrc - llvm_systemd llvm_systemd_mu hardened_openrc hardened_nomultilib_openrc @@ -28,7 +25,6 @@ SETS=" musl_hardened musl_llvm x32_openrc - x32_systemd x32_systemd_mu " @@ -37,9 +33,6 @@ SET_openrc_OPTIONAL_SPECS="stage3d-openrc.spec installcd-stage1.spec installcd-s SET_livegui_OPTIONAL_SPECS="livegui/livegui-stage1.spec livegui/livegui-stage2.spec" -SET_systemd_SPECS="stage1-systemd.spec stage3-systemd.spec" -SET_systemd_OPTIONAL_SPECS="stage3d-systemd.spec" - SET_systemd_mu_SPECS="stage1-systemd-mu.spec stage3-systemd-mu.spec" SET_systemd_mu_OPTIONAL_SPECS="stage3d-systemd-mu.spec" @@ -54,14 +47,10 @@ SET_hardened_nomultilib_openrc_SPECS="hardened-nomultilib/stage1-openrc.spec har SET_nomultilib_openrc_SPECS="nomultilib/stage1-openrc.spec nomultilib/stage3-openrc.spec" -SET_nomultilib_systemd_SPECS="nomultilib/stage1-systemd.spec nomultilib/stage3-systemd.spec" - SET_nomultilib_systemd_mu_SPECS="nomultilib/stage1-systemd-mu.spec nomultilib/stage3-systemd-mu.spec" SET_llvm_openrc_SPECS="clang/stage1-openrc.spec clang/stage3-openrc.spec" -SET_llvm_systemd_SPECS="clang/stage1-systemd.spec clang/stage3-systemd.spec" - SET_llvm_systemd_mu_SPECS="clang/stage1-systemd-mu.spec clang/stage3-systemd-mu.spec" SET_musl_SPECS="musl/stage1.spec musl/stage3.spec" @@ -72,8 +61,6 @@ SET_musl_hardened_SPECS="musl-hardened/stage1.spec musl-hardened/stage3.spec" SET_x32_openrc_SPECS="x32/stage1-openrc.spec x32/stage3-openrc.spec" -SET_x32_systemd_SPECS="x32/stage1-systemd.spec x32/stage3-systemd.spec" - SET_x32_systemd_mu_SPECS="x32/stage1-systemd-mu.spec x32/stage3-systemd-mu.spec" KCONFIG_DIR=${REPO_DIR}/releases/kconfig/amd64 @@ -82,7 +69,7 @@ EXTENSIONS="@(.tar.xz|.tar.bz2|.tar.gz|.tar|.sfs)" update_symlinks() { # Symlink the latest stages3 to build from - for d in ${BUILD_SRCDIR_BASE}/builds/{default,clang,hardened,llvm-mergedusr,mergedusr,musl,musl-clang,musl-hardened} ; do + for d in "${BUILD_SRCDIR_BASE}/builds"/* ; do mkdir -p "${d}" pushd "${d}" >/dev/null || exit shopt -s extglob @@ -110,33 +97,19 @@ post_build() { case ${spec} in stage3-openrc.spec) upload stage3-amd64-openrc-${TIMESTAMP}.tar.xz* - ;; - stage3-systemd.spec) - upload stage3-amd64-systemd-${TIMESTAMP}.tar.xz* # do not upsync_binpackages, done by extra builder ;; stage3d-openrc.spec) upload stage3-amd64-desktop-openrc-${TIMESTAMP}.tar.xz* ;; - stage3d-systemd.spec) - upload stage3-amd64-desktop-systemd-${TIMESTAMP}.tar.xz* - # do not upsync_binpackages, done by extra builder - ;; installcd-stage2-minimal.spec) upload install-amd64-minimal-${TIMESTAMP}.iso* ;; nomultilib/stage3-openrc.spec) upload stage3-amd64-nomultilib-openrc-${TIMESTAMP}.tar.xz* ;; - nomultilib/stage3-systemd.spec) - upload stage3-amd64-nomultilib-systemd-${TIMESTAMP}.tar.xz* - # do not upsync_binpackages, done by extra builder - ;; x32/stage3-openrc.spec) upload stage3-x32-openrc-${TIMESTAMP}.tar.xz* - ;; - x32/stage3-systemd.spec) - upload stage3-x32-systemd-${TIMESTAMP}.tar.xz* upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/default/stage3-x32" amd64/17.0/x32 ;; livegui/livegui-stage2.spec) @@ -166,9 +139,6 @@ post_build() { case ${spec} in clang/stage3-openrc.spec) upload stage3-amd64-llvm-openrc-${TIMESTAMP}.tar.xz* - ;; - clang/stage3-systemd.spec) - upload stage3-amd64-llvm-systemd-${TIMESTAMP}.tar.xz* upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/clang/stage3-amd64" amd64/17.1/x86-64_llvm ;; esac