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.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id E7CE4139335 for ; Tue, 29 Jun 2021 21:12:26 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 33A8EE07F9; Tue, 29 Jun 2021 21:12:26 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 1CB33E07F9 for ; Tue, 29 Jun 2021 21:12:26 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 0DC6C335C3D for ; Tue, 29 Jun 2021 21:12:25 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 99FFB4C3 for ; Tue, 29 Jun 2021 21:12:23 +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: <1625001114.4bedfac79514e54fce9090b49ad716a723d4ec27.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: 4bedfac79514e54fce9090b49ad716a723d4ec27 X-VCS-Branch: master Date: Tue, 29 Jun 2021 21:12:23 +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: 059cf7c2-cb39-49fa-ac6b-ec8443273c50 X-Archives-Hash: 96dd6dca2ccb09117c66879fc744890d commit: 4bedfac79514e54fce9090b49ad716a723d4ec27 Author: Andreas K. Hüttel gentoo org> AuthorDate: Tue Jun 29 21:11:54 2021 +0000 Commit: Andreas K. Hüttel gentoo org> CommitDate: Tue Jun 29 21:11:54 2021 +0000 URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=4bedfac7 catalyst-auto: also here, move riscv64 stages back to build-type default Signed-off-by: Andreas K. Hüttel gentoo.org> tools/catalyst-auto-qemu-riscv.conf | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/tools/catalyst-auto-qemu-riscv.conf b/tools/catalyst-auto-qemu-riscv.conf index 4954bdae..6a03879b 100644 --- a/tools/catalyst-auto-qemu-riscv.conf +++ b/tools/catalyst-auto-qemu-riscv.conf @@ -19,9 +19,6 @@ SETS=" multilib_200_systemd " -# riscv32 does not work yet -# ilp32 - SET_lp64d_200_openrc_SPECS="stage1-lp64d-20.0-openrc.spec stage3-lp64d-20.0-openrc.spec" SET_lp64d_200_systemd_SPECS="stage1-lp64d-20.0-systemd.spec stage3-lp64d-20.0-systemd.spec" SET_lp64_200_openrc_SPECS="stage1-lp64-20.0-openrc.spec stage3-lp64-20.0-openrc.spec" @@ -29,12 +26,10 @@ SET_lp64_200_systemd_SPECS="stage1-lp64-20.0-systemd.spec stage3-lp64-20.0-syste SET_multilib_200_openrc_SPECS="stage1-multilib-20.0-openrc.spec stage3-multilib-20.0-openrc.spec" SET_multilib_200_systemd_SPECS="stage1-multilib-20.0-systemd.spec stage3-multilib-20.0-systemd.spec" -SET_ilp32_SPECS="stage1-ilp32.spec stage3-ilp32.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/20.0" ; do + for d in "${BUILD_SRCDIR_BASE}/builds/default" ; do pushd "${d}" >/dev/null for f in $(ls stage3*xz | grep -v latest | give_latest_from_dates) ; do local of=$(echo "${f}" | convert_filename) @@ -49,7 +44,7 @@ post_build() { case ${spec} in stage3*.spec) - pushd "${BUILD_SRCDIR_BASE}/builds/20.0" >/dev/null + pushd "${BUILD_SRCDIR_BASE}/builds/default" >/dev/null upload stage3-rv64_$(echo ${spec}|sed -e 's:^stage3-::g' -e 's:\.spec$::g')-${TIMESTAMP}*.xz* popd >/dev/null ;;