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 AD32B158013 for ; Fri, 15 Dec 2023 18:38:28 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D8BD72BC017; Fri, 15 Dec 2023 18:38:27 +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 B6D712BC017 for ; Fri, 15 Dec 2023 18:38:27 +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 B72E8335C8E for ; Fri, 15 Dec 2023 18:38:26 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 3F3AEACA for ; Fri, 15 Dec 2023 18:38:25 +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: <1702665465.f1f0eaa27cfeac2335a7c16575205e5e06222f6b.dilfridge@gentoo> Subject: [gentoo-commits] proj/releng:master commit in: tools/ X-VCS-Repository: proj/releng X-VCS-Files: tools/catalyst-auto-qemu-m68k.conf X-VCS-Directories: tools/ X-VCS-Committer: dilfridge X-VCS-Committer-Name: Andreas K. Hüttel X-VCS-Revision: f1f0eaa27cfeac2335a7c16575205e5e06222f6b X-VCS-Branch: master Date: Fri, 15 Dec 2023 18:38:25 +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: 3886c0de-3bca-4d06-8f3f-90af60fe0a09 X-Archives-Hash: f4fbe6e1788c1497e9b4b37c5e87c6df commit: f1f0eaa27cfeac2335a7c16575205e5e06222f6b Author: Andreas K. Hüttel gentoo org> AuthorDate: Fri Dec 15 18:37:45 2023 +0000 Commit: Andreas K. Hüttel gentoo org> CommitDate: Fri Dec 15 18:37:45 2023 +0000 URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=f1f0eaa2 Enable all m68k 23.0 builds Signed-off-by: Andreas K. Hüttel gentoo.org> tools/catalyst-auto-qemu-m68k.conf | 29 ++++++++++++++++++++++------- 1 file changed, 22 insertions(+), 7 deletions(-) diff --git a/tools/catalyst-auto-qemu-m68k.conf b/tools/catalyst-auto-qemu-m68k.conf index ed9f3b3e..0a6615f8 100644 --- a/tools/catalyst-auto-qemu-m68k.conf +++ b/tools/catalyst-auto-qemu-m68k.conf @@ -14,17 +14,23 @@ SETS=" musl openrc systemd_mu + musl_23 + openrc_23 + systemd_23 " SET_openrc_SPECS="stage1-openrc.spec stage3-openrc.spec" -SET_systemd_SPECS="stage1-systemd.spec stage3-systemd.spec" SET_systemd_mu_SPECS="stage1-systemd-mu.spec stage3-systemd-mu.spec" SET_musl_SPECS="stage1-musl.spec stage3-musl.spec" +SET_openrc_23_SPECS="stage1-openrc-23.spec stage3-openrc-23.spec" +SET_systemd_23_SPECS="stage1-systemd-23.spec stage3-systemd-23.spec" +SET_musl_23_SPECS="stage1-musl-23.spec stage3-musl-23.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/mergedusr" "${BUILD_SRCDIR_BASE}/builds/musl" ; 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 @@ -42,11 +48,6 @@ post_build() { stage3-openrc.spec) pushd "${BUILD_SRCDIR_BASE}/builds/default" >/dev/null upload stage3-m68k-openrc-${TIMESTAMP}*.xz* - popd >/dev/null - ;; - stage3-systemd.spec) - pushd "${BUILD_SRCDIR_BASE}/builds/default" >/dev/null - upload stage3-m68k-systemd-${TIMESTAMP}*.xz* upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/default/stage3-m68k" m68k/17.0/m68k popd >/dev/null ;; @@ -61,6 +62,20 @@ post_build() { upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/musl/stage3-m68k_musl" m68k/17.0/m68k_musl popd >/dev/null ;; + stage3-openrc-23.spec) + pushd "${BUILD_SRCDIR_BASE}/builds/23.0-default" >/dev/null + popd >/dev/null + ;; + stage3-systemd-23.spec) + pushd "${BUILD_SRCDIR_BASE}/builds/23.0-default" >/dev/null + upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/23.0-default/stage3-m68k" m68k/23.0/m68k + popd >/dev/null + ;; + stage3-musl-23.spec) + pushd "${BUILD_SRCDIR_BASE}/builds/23.0-musl" >/dev/null + upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/23.0-musl/stage3-m68k_musl" m68k/23.0/m68k_musl + popd >/dev/null + ;; *) echo "Finished ${spec}" ;;