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 899BA158013 for ; Thu, 14 Dec 2023 22:33:52 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D02502BC018; Thu, 14 Dec 2023 22:33: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) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 833F02BC018 for ; Thu, 14 Dec 2023 22:33: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) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 5E78833BE26 for ; Thu, 14 Dec 2023 22:33:50 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id AD7B4119 for ; Thu, 14 Dec 2023 22:33:48 +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: <1702593198.3e97eeedb8b0fa38b327bc152523851f11ef7f23.dilfridge@gentoo> Subject: [gentoo-commits] proj/releng:master commit in: tools/ X-VCS-Repository: proj/releng X-VCS-Files: tools/catalyst-auto-arm.conf X-VCS-Directories: tools/ X-VCS-Committer: dilfridge X-VCS-Committer-Name: Andreas K. Hüttel X-VCS-Revision: 3e97eeedb8b0fa38b327bc152523851f11ef7f23 X-VCS-Branch: master Date: Thu, 14 Dec 2023 22:33:48 +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: 53baf5c3-b1f6-4bd5-9a28-e9d251e23abb X-Archives-Hash: d0667cb2a182d4e75d9893f91ef9f9d3 commit: 3e97eeedb8b0fa38b327bc152523851f11ef7f23 Author: Andreas K. Hüttel gentoo org> AuthorDate: Thu Dec 14 22:33:18 2023 +0000 Commit: Andreas K. Hüttel gentoo org> CommitDate: Thu Dec 14 22:33:18 2023 +0000 URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=3e97eeed Stop building and uploading arm systemd split-usr stages, sync with openrc Signed-off-by: Andreas K. Hüttel gentoo.org> tools/catalyst-auto-arm.conf | 26 +------------------------- 1 file changed, 1 insertion(+), 25 deletions(-) diff --git a/tools/catalyst-auto-arm.conf b/tools/catalyst-auto-arm.conf index 7610aa91..fe7383d8 100644 --- a/tools/catalyst-auto-arm.conf +++ b/tools/catalyst-auto-arm.conf @@ -30,39 +30,33 @@ SETS=" " SET_armv4tl_openrc_SPECS="armv4tl/stage1-openrc.spec armv4tl/stage3-openrc.spec" -SET_armv4tl_systemd_SPECS="armv4tl/stage1-systemd.spec armv4tl/stage3-systemd.spec" SET_armv4tl_systemd_mu_SPECS="armv4tl/stage1-systemd-mu.spec armv4tl/stage3-systemd-mu.spec" SET_armv5tel_openrc_SPECS="armv5tel/stage1-openrc.spec armv5tel/stage3-openrc.spec" -SET_armv5tel_systemd_SPECS="armv5tel/stage1-systemd.spec armv5tel/stage3-systemd.spec" SET_armv5tel_systemd_mu_SPECS="armv5tel/stage1-systemd-mu.spec armv5tel/stage3-systemd-mu.spec" SET_armv6j_hf_openrc_SPECS="armv6j/stage1-hardfloat-openrc.spec armv6j/stage3-hardfloat-openrc.spec" -SET_armv6j_hf_systemd_SPECS="armv6j/stage1-hardfloat-systemd.spec armv6j/stage3-hardfloat-systemd.spec" SET_armv6j_hf_systemd_mu_SPECS="armv6j/stage1-hardfloat-systemd-mu.spec armv6j/stage3-hardfloat-systemd-mu.spec" SET_armv6j_sf_openrc_SPECS="armv6j/stage1-openrc.spec armv6j/stage3-openrc.spec" -SET_armv6j_sf_systemd_SPECS="armv6j/stage1-systemd.spec armv6j/stage3-systemd.spec" SET_armv6j_sf_systemd_mu_SPECS="armv6j/stage1-systemd-mu.spec armv6j/stage3-systemd-mu.spec" SET_armv6j_hf_musl_openrc_SPECS="armv6j-musl/stage1-hardfloat.spec armv6j-musl/stage3-hardfloat.spec" SET_armv6j_hf_musl_hardened_openrc_SPECS="armv6j-musl-hardened/stage1-hardfloat.spec armv6j-musl-hardened/stage3-hardfloat.spec" SET_armv7a_hf_openrc_SPECS="armv7a/stage1-hardfloat-openrc.spec armv7a/stage3-hardfloat-openrc.spec" -SET_armv7a_hf_systemd_SPECS="armv7a/stage1-hardfloat-systemd.spec armv7a/stage3-hardfloat-systemd.spec" SET_armv7a_hf_systemd_mu_SPECS="armv7a/stage1-hardfloat-systemd-mu.spec armv7a/stage3-hardfloat-systemd-mu.spec" SET_armv7a_hf_musl_openrc_SPECS="armv7a-musl/stage1-hardfloat.spec armv7a-musl/stage3-hardfloat.spec" SET_armv7a_hf_musl_hardened_openrc_SPECS="armv7a-musl-hardened/stage1-hardfloat.spec armv7a-musl-hardened/stage3-hardfloat.spec" SET_armv7a_sf_openrc_SPECS="armv7a/stage1-openrc.spec armv7a/stage3-openrc.spec" -SET_armv7a_sf_systemd_SPECS="armv7a/stage1-systemd.spec armv7a/stage3-systemd.spec" SET_armv7a_sf_systemd_mu_SPECS="armv7a/stage1-systemd-mu.spec armv7a/stage3-systemd-mu.spec" update_symlinks() { # Symlink the latest stages3 to build from local d f - for d in "${BUILD_SRCDIR_BASE}/builds/default" "${BUILD_SRCDIR_BASE}/builds/musl" "${BUILD_SRCDIR_BASE}/builds/musl-hardened" "${BUILD_SRCDIR_BASE}/builds/mergedusr" ; do + for d in "${BUILD_SRCDIR_BASE}/builds"/* ; do mkdir -p "${d}" pushd "${d}" >/dev/null for f in $(ls stage3*xz | grep -v latest | give_latest_from_dates) ; do @@ -81,44 +75,26 @@ post_build() { case ${spec} in armv4tl/stage3-openrc.spec) upload stage3-armv4tl-openrc-${TIMESTAMP}*.xz* - ;; - armv4tl/stage3-systemd.spec) - upload stage3-armv4tl-systemd-${TIMESTAMP}*.xz* upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/default/stage3-armv4tl" arm/17.0/armv4tl ;; armv5tel/stage3-openrc.spec) upload stage3-armv5tel-openrc-${TIMESTAMP}*.xz* - ;; - armv5tel/stage3-systemd.spec) - upload stage3-armv5tel-systemd-${TIMESTAMP}*.xz* upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/default/stage3-armv5tel" arm/17.0/armv5tel ;; armv6j/stage3-openrc.spec) upload stage3-armv6j-openrc-${TIMESTAMP}*.xz* - ;; - armv6j/stage3-systemd.spec) - upload stage3-armv6j-systemd-${TIMESTAMP}*.xz* upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/default/stage3-armv6j" arm/17.0/armv6j ;; armv6j/stage3-hardfloat-openrc.spec) upload stage3-armv6j_hardfp-openrc-${TIMESTAMP}*.xz* - ;; - armv6j/stage3-hardfloat-systemd.spec) - upload stage3-armv6j_hardfp-systemd-${TIMESTAMP}*.xz* upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/default/stage3-armv6j_hardfp" arm/17.0/armv6j_hardfp ;; armv7a/stage3-openrc.spec) upload stage3-armv7a-openrc-${TIMESTAMP}*.xz* - ;; - armv7a/stage3-systemd.spec) - upload stage3-armv7a-systemd-${TIMESTAMP}*.xz* upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/default/stage3-armv7a" arm/17.0/armv7a ;; armv7a/stage3-hardfloat-openrc.spec) upload stage3-armv7a_hardfp-openrc-${TIMESTAMP}*.xz* - ;; - armv7a/stage3-hardfloat-systemd.spec) - upload stage3-armv7a_hardfp-systemd-${TIMESTAMP}*.xz* upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/default/stage3-armv7a_hardfp" arm/17.0/armv7a_hardfp ;; esac