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) server-digest SHA256) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 4B957158041 for ; Sun, 31 Mar 2024 12:05:12 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 8A93EE299E; Sun, 31 Mar 2024 12:05:11 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 6B721E299E for ; Sun, 31 Mar 2024 12:05:11 +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) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 58664342FF8 for ; Sun, 31 Mar 2024 12:05:10 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id AD7DF14E4 for ; Sun, 31 Mar 2024 12:05:08 +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: <1711886684.3a1a13decdb951cb5472d90736af8fce394f5e41.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: 3a1a13decdb951cb5472d90736af8fce394f5e41 X-VCS-Branch: master Date: Sun, 31 Mar 2024 12:05:08 +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: 41e1a5ef-8e82-482a-9143-55c36e85c7e5 X-Archives-Hash: b9256ea70e84cdea1e4894cb4de00b98 commit: 3a1a13decdb951cb5472d90736af8fce394f5e41 Author: Andreas K. Hüttel gentoo org> AuthorDate: Sun Mar 31 12:04:44 2024 +0000 Commit: Andreas K. Hüttel gentoo org> CommitDate: Sun Mar 31 12:04:44 2024 +0000 URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=3a1a13de Switch amd64 bootmedia uploads to 23.0 Signed-off-by: Andreas K. Hüttel gentoo.org> tools/catalyst-auto-amd64.conf | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/tools/catalyst-auto-amd64.conf b/tools/catalyst-auto-amd64.conf index 5d45b13f..933b04df 100644 --- a/tools/catalyst-auto-amd64.conf +++ b/tools/catalyst-auto-amd64.conf @@ -11,6 +11,7 @@ SPECS_DIR=${REPO_DIR}/releases/specs/amd64 SETS=" openrc_23 + livegui_23 openrc_23_su systemd_23 nomultilib_openrc_23 @@ -27,7 +28,6 @@ SETS=" x32_openrc_23 x32_systemd_23 openrc - livegui nomultilib_openrc llvm_openrc hardened_openrc @@ -43,12 +43,9 @@ SETS=" # 17.0 SET_openrc_SPECS="stage1-openrc.spec stage3-openrc.spec" -SET_openrc_OPTIONAL_SPECS="stage3d-openrc.spec installcd-stage1.spec installcd-stage2-minimal.spec" - -SET_livegui_OPTIONAL_SPECS="livegui/livegui-stage1.spec livegui/livegui-stage2.spec" +SET_openrc_OPTIONAL_SPECS="stage3d-openrc.spec" SET_hardened_openrc_SPECS="hardened/stage1-openrc.spec hardened/stage3-openrc.spec" -SET_hardened_openrc_OPTIONAL_SPECS="hardened/admincd-stage1.spec hardened/admincd-stage2.spec" SET_hardened_selinux_openrc_SPECS="hardened-selinux/stage1-openrc.spec hardened-selinux/stage3-openrc.spec" @@ -71,7 +68,9 @@ SET_x32_openrc_SPECS="x32/stage1-openrc.spec x32/stage3-openrc.spec" # 23.0 SET_openrc_23_SPECS="stage1-openrc-23.spec stage3-openrc-23.spec" -SET_openrc_23_OPTIONAL_SPECS="stage3d-openrc-23.spec" +SET_openrc_23_OPTIONAL_SPECS="stage3d-openrc-23.spec installcd-stage1.spec installcd-stage2-minimal.spec" + +SET_livegui_23_OPTIONAL_SPECS="livegui/livegui-stage1.spec livegui/livegui-stage2.spec" SET_openrc_23_su_SPECS="stage1-openrc-23-su.spec stage3-openrc-23-su.spec" @@ -79,6 +78,7 @@ SET_systemd_23_SPECS="stage1-systemd-23.spec stage3-systemd-23.spec" SET_systemd_23_OPTIONAL_SPECS="stage3d-systemd-23.spec" SET_hardened_openrc_23_SPECS="hardened/stage1-openrc-23.spec hardened/stage3-openrc-23.spec" +SET_hardened_openrc_23_OPTIONAL_SPECS="hardened/admincd-stage1.spec hardened/admincd-stage2.spec" SET_hardened_systemd_23_SPECS="hardened/stage1-systemd-23.spec hardened/stage3-systemd-23.spec" @@ -137,15 +137,9 @@ post_build() { pushd "${BUILD_SRCDIR_BASE}"/builds/default >/dev/null || exit case ${spec} in - installcd-stage2-minimal.spec) - upload install-amd64-minimal-${TIMESTAMP}.iso* - ;; x32/stage3-openrc.spec) upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/default/stage3-x32" amd64/17.0/x32 ;; - livegui/livegui-stage2.spec) - upload livegui-amd64-${TIMESTAMP}.iso* - ;; esac popd >/dev/null || exit @@ -167,6 +161,12 @@ post_build() { 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* + ;; + livegui/livegui-stage2.spec) + upload livegui-amd64-${TIMESTAMP}.iso* + ;; nomultilib/stage3-openrc-23.spec) upload stage3-amd64-nomultilib-openrc-${TIMESTAMP}.tar.xz* # do not upsync_binpackages, done by extra builder @@ -217,9 +217,6 @@ post_build() { hardened/stage3-openrc.spec) upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/hardened/stage3-amd64" amd64/17.1/x86-64_hardened ;; - hardened/admincd-stage2.spec) - upload admincd-amd64-${TIMESTAMP}.iso* - ;; esac popd >/dev/null || exit @@ -232,6 +229,9 @@ post_build() { upload stage3-amd64-hardened-systemd-${TIMESTAMP}.tar.xz* upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/23.0-hardened/stage3-amd64" amd64/23.0/x86-64_hardened ;; + hardened/admincd-stage2.spec) + upload admincd-amd64-${TIMESTAMP}.iso* + ;; hardened-nomultilib/stage3-openrc-23.spec) upload stage3-amd64-hardened-nomultilib-openrc-${TIMESTAMP}.tar.xz* ;;