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 38CC1158041 for ; Sat, 23 Mar 2024 13:01:53 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 2E18FE2A04; Sat, 23 Mar 2024 13:01:52 +0000 (UTC) Received: from smtp.gentoo.org (smtp.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)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 176C2E2A04 for ; Sat, 23 Mar 2024 13:01:52 +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 36C22343028 for ; Sat, 23 Mar 2024 13:01:50 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 69018156A for ; Sat, 23 Mar 2024 13:01: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: <1711198890.f5f9577240a4cc84d5bb8c5d50d39a94be3a6987.dilfridge@gentoo> Subject: [gentoo-commits] proj/releng:master commit in: tools/ X-VCS-Repository: proj/releng X-VCS-Files: tools/catalyst-auto-qemu-riscv.conf X-VCS-Directories: tools/ X-VCS-Committer: dilfridge X-VCS-Committer-Name: Andreas K. Hüttel X-VCS-Revision: f5f9577240a4cc84d5bb8c5d50d39a94be3a6987 X-VCS-Branch: master Date: Sat, 23 Mar 2024 13:01: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: 0452fb6d-e9e4-4a3a-a743-404d21caf36b X-Archives-Hash: 61ca3c4dcbae01ef0ecca5315743ec30 commit: f5f9577240a4cc84d5bb8c5d50d39a94be3a6987 Author: Andreas K. Hüttel gentoo org> AuthorDate: Sat Mar 23 13:01:30 2024 +0000 Commit: Andreas K. Hüttel gentoo org> CommitDate: Sat Mar 23 13:01:30 2024 +0000 URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=f5f95772 Upload 23.0 stages for riscv Signed-off-by: Andreas K. Hüttel gentoo.org> tools/catalyst-auto-qemu-riscv.conf | 67 +++++++++++++++++++------------------ 1 file changed, 34 insertions(+), 33 deletions(-) diff --git a/tools/catalyst-auto-qemu-riscv.conf b/tools/catalyst-auto-qemu-riscv.conf index 46cdbddb..328b500a 100644 --- a/tools/catalyst-auto-qemu-riscv.conf +++ b/tools/catalyst-auto-qemu-riscv.conf @@ -20,25 +20,19 @@ SETS=" multilib_openrc_23 multilib_systemd_23 lp64d_openrc - lp64d_systemd_mu lp64d_musl lp64_openrc - lp64_systemd_mu lp64_musl multilib_openrc - multilib_systemd_mu " SET_lp64d_musl_SPECS="stage1-lp64d-musl.spec stage3-lp64d-musl.spec" SET_lp64d_openrc_SPECS="stage1-lp64d-openrc.spec stage3-lp64d-openrc.spec" -SET_lp64d_systemd_mu_SPECS="stage1-lp64d-systemd-mu.spec stage3-lp64d-systemd-mu.spec" SET_lp64_musl_SPECS="stage1-lp64-musl.spec stage3-lp64-musl.spec" SET_lp64_openrc_SPECS="stage1-lp64-openrc.spec stage3-lp64-openrc.spec" -SET_lp64_systemd_mu_SPECS="stage1-lp64-systemd-mu.spec stage3-lp64-systemd-mu.spec" SET_multilib_openrc_SPECS="stage1-multilib-openrc.spec stage3-multilib-openrc.spec" -SET_multilib_systemd_mu_SPECS="stage1-multilib-systemd-mu.spec stage3-multilib-systemd-mu.spec" SET_lp64d_musl_23_SPECS="stage1-lp64d-musl-23.spec stage3-lp64d-musl-23.spec" SET_lp64d_openrc_23_SPECS="stage1-lp64d-openrc-23.spec stage3-lp64d-openrc-23.spec" @@ -68,42 +62,49 @@ update_symlinks() { post_build() { local set=$1 spec=$2 + pushd "${BUILD_SRCDIR_BASE}" >/dev/null case ${spec} in - stage3*systemd-23.spec) - pushd "${BUILD_SRCDIR_BASE}/builds/23.0-default" >/dev/null - upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/23.0-default/stage3-rv64_lp64d" riscv/23.0/rv64_lp64d - upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/23.0-default/stage3-rv64_lp64" riscv/23.0/rv64_lp64 - upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/23.0-default/stage3-rv64_multilib" riscv/23.0/rv64_multilib - popd >/dev/null + stage3-lp64d-openrc-23.spec) + upload builds/23.0-default/stage3-rv64_lp64d-openrc-${TIMESTAMP}*.xz* ;; - stage3*musl-23.spec) - pushd "${BUILD_SRCDIR_BASE}/builds/23.0-musl" >/dev/null - upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/23.0-musl/stage3-rv64_lp64d_musl" riscv/23.0/rv64_lp64d_musl - upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/23.0-musl/stage3-rv64_lp64_musl" riscv/23.0/rv64_lp64_musl - popd >/dev/null + stage3-lp64d-systemd-23.spec) + upload builds/23.0-default/stage3-rv64_lp64d-systemd-${TIMESTAMP}*.xz* + upsync_binpackages packages/23.0-default/stage3-rv64_lp64d riscv/23.0/rv64_lp64d ;; - stage3*openrc.spec) - pushd "${BUILD_SRCDIR_BASE}/builds/default" >/dev/null - upload stage3-rv64_$(echo ${spec}|sed -e 's:^stage3-::g' -e 's:\.spec$::g')-${TIMESTAMP}*.xz* - upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/default/stage3-rv64_lp64d" riscv/20.0/rv64_lp64d - upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/default/stage3-rv64_lp64" riscv/20.0/rv64_lp64 - upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/default/stage3-rv64_multilib" riscv/20.0/rv64_multilib - popd >/dev/null + stage3-lp64-openrc-23.spec) + upload builds/23.0-default/stage3-rv64_lp64-openrc-${TIMESTAMP}*.xz* + ;; + stage3-lp64-systemd-23.spec) + upload builds/23.0-default/stage3-rv64_lp64-systemd-${TIMESTAMP}*.xz* + upsync_binpackages packages/23.0-default/stage3-rv64_lp64 riscv/23.0/rv64_lp64 + ;; + stage3-multilib-openrc-23.spec) + upload builds/23.0-default/stage3-rv64_multilib-openrc-${TIMESTAMP}*.xz* + ;; + stage3-multilib-systemd-23.spec) + upload builds/23.0-default/stage3-rv64_multilib-systemd-${TIMESTAMP}*.xz* + upsync_binpackages packages/23.0-default/stage3-rv64_multilib riscv/23.0/rv64_multilib ;; - stage3*systemd-mu.spec) - pushd "${BUILD_SRCDIR_BASE}/builds/mergedusr" >/dev/null - upload stage3-rv64_$(echo ${spec}|sed -e 's:^stage3-::g' -e 's:\.spec$::g' -e 's:-mu:-mergedusr:g')-${TIMESTAMP}*.xz* - popd >/dev/null + stage3-lp64d-musl-23.spec) + upload builds/23.0-musl/stage3-rv64_lp64d_musl-${TIMESTAMP}*.xz* + upsync_binpackages packages/23.0-musl/stage3-rv64_lp64d_musl riscv/23.0/rv64_lp64d_musl + ;; + stage3-lp64-musl-23.spec) + upload builds/23.0-musl/stage3-rv64_lp64_musl-${TIMESTAMP}*.xz* + upsync_binpackages packages/23.0-musl/stage3-rv64_lp64_musl riscv/23.0/rv64_lp64_musl + ;; + stage3*openrc.spec) + upsync_binpackages packages/default/stage3-rv64_lp64d riscv/20.0/rv64_lp64d + upsync_binpackages packages/default/stage3-rv64_lp64 riscv/20.0/rv64_lp64 + upsync_binpackages packages/default/stage3-rv64_multilib riscv/20.0/rv64_multilib ;; stage3*musl.spec) - pushd "${BUILD_SRCDIR_BASE}/builds/musl" >/dev/null - upload stage3-rv64_$(echo ${spec}|sed -e 's:^stage3-::g' -e 's:-:_:g' -e 's:\.spec$::g')-${TIMESTAMP}*.xz* - upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/musl/stage3-rv64_lp64d_musl" riscv/20.0/rv64_lp64d_musl - upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/musl/stage3-rv64_lp64_musl" riscv/20.0/rv64_lp64_musl - popd >/dev/null + upsync_binpackages packages/musl/stage3-rv64_lp64d_musl riscv/20.0/rv64_lp64d_musl + upsync_binpackages packages/musl/stage3-rv64_lp64_musl riscv/20.0/rv64_lp64_musl ;; *) echo "Finished ${spec}" ;; esac + popd >/dev/null }