[gentoo-commits] proj/releng:master commit in: tools/

[Andreas K. Hüttel]

commit:     4bedfac79514e54fce9090b49ad716a723d4ec27
Author:     Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Tue Jun 29 21:11:54 2021 +0000
Commit:     Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> 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 <dilfridge <AT> 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
 			;;