[gentoo-commits] proj/releng:master commit in: releases/specs-qemu/riscv/, tools/

["Andreas K. Hüttel" <dilfridge@gentoo.org>]

commit:     53d7a6a3abfbf94dbdb117d1e1e81f6959052d4d
Author:     Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Thu Jun 17 22:49:08 2021 +0000
Commit:     Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Thu Jun 17 22:49:08 2021 +0000
URL:        https://gitweb.gentoo.org/proj/releng.git/commit/?id=53d7a6a3

riscv: Add 20.0 lp64 (softfloat) builds

Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>

 releases/specs-qemu/riscv/stage1-lp64-20.0-openrc.spec  | 15 +++++++++++++++
 releases/specs-qemu/riscv/stage1-lp64-20.0-systemd.spec | 15 +++++++++++++++
 releases/specs-qemu/riscv/stage3-lp64-20.0-openrc.spec  | 13 +++++++++++++
 releases/specs-qemu/riscv/stage3-lp64-20.0-systemd.spec | 13 +++++++++++++
 tools/catalyst-auto-qemu-riscv.conf                     |  6 +++++-
 5 files changed, 61 insertions(+), 1 deletion(-)

diff --git a/releases/specs-qemu/riscv/stage1-lp64-20.0-openrc.spec b/releases/specs-qemu/riscv/stage1-lp64-20.0-openrc.spec
new file mode 100644
index 00000000..1b894918
--- /dev/null
+++ b/releases/specs-qemu/riscv/stage1-lp64-20.0-openrc.spec
@@ -0,0 +1,15 @@
+subarch: rv64_lp64
+target: stage1
+version_stamp: 20.0-openrc-@TIMESTAMP@
+cflags: -O2 -pipe
+interpreter: /usr/bin/qemu-riscv64
+rel_type: 20.0
+profile: default/linux/riscv/20.0/rv64gc/lp64
+snapshot: @TIMESTAMP@
+source_subpath: 20.0/stage3-rv64_lp64-20.0-openrc-latest
+compression_mode: pixz
+decompressor_search_order: xz bzip2
+update_seed: yes
+update_seed_command: -uDN @world
+portage_confdir: @REPO_DIR@/releases/portage/stages-qemu
+portage_prefix: releng

diff --git a/releases/specs-qemu/riscv/stage1-lp64-20.0-systemd.spec b/releases/specs-qemu/riscv/stage1-lp64-20.0-systemd.spec
new file mode 100644
index 00000000..c0229f34
--- /dev/null
+++ b/releases/specs-qemu/riscv/stage1-lp64-20.0-systemd.spec
@@ -0,0 +1,15 @@
+subarch: rv64_lp64
+target: stage1
+version_stamp: 20.0-systemd-@TIMESTAMP@
+cflags: -O2 -pipe
+interpreter: /usr/bin/qemu-riscv64
+rel_type: 20.0
+profile: default/linux/riscv/20.0/rv64gc/lp64/systemd
+snapshot: @TIMESTAMP@
+source_subpath: 20.0/stage3-rv64_lp64-20.0-systemd-latest
+compression_mode: pixz
+decompressor_search_order: xz bzip2
+update_seed: yes
+update_seed_command: -uDN @world
+portage_confdir: @REPO_DIR@/releases/portage/stages-qemu
+portage_prefix: releng

diff --git a/releases/specs-qemu/riscv/stage3-lp64-20.0-openrc.spec b/releases/specs-qemu/riscv/stage3-lp64-20.0-openrc.spec
new file mode 100644
index 00000000..867c071a
--- /dev/null
+++ b/releases/specs-qemu/riscv/stage3-lp64-20.0-openrc.spec
@@ -0,0 +1,13 @@
+subarch: rv64_lp64
+target: stage3
+version_stamp: 20.0-openrc-@TIMESTAMP@
+cflags: -O2 -pipe
+interpreter: /usr/bin/qemu-riscv64
+rel_type: 20.0
+profile: default/linux/riscv/20.0/rv64gc/lp64
+snapshot: @TIMESTAMP@
+source_subpath: 20.0/stage1-rv64_lp64-20.0-openrc-@TIMESTAMP@
+compression_mode: pixz
+decompressor_search_order: xz bzip2
+portage_confdir: @REPO_DIR@/releases/portage/stages-qemu
+portage_prefix: releng

diff --git a/releases/specs-qemu/riscv/stage3-lp64-20.0-systemd.spec b/releases/specs-qemu/riscv/stage3-lp64-20.0-systemd.spec
new file mode 100644
index 00000000..a7fdb7a9
--- /dev/null
+++ b/releases/specs-qemu/riscv/stage3-lp64-20.0-systemd.spec
@@ -0,0 +1,13 @@
+subarch: rv64_lp64
+target: stage3
+version_stamp: 20.0-systemd-@TIMESTAMP@
+cflags: -O2 -pipe
+interpreter: /usr/bin/qemu-riscv64
+rel_type: 20.0
+profile: default/linux/riscv/20.0/rv64gc/lp64/systemd
+snapshot: @TIMESTAMP@
+source_subpath: 20.0/stage1-rv64_lp64-20.0-systemd-@TIMESTAMP@
+compression_mode: pixz
+decompressor_search_order: xz bzip2
+portage_confdir: @REPO_DIR@/releases/portage/stages-qemu
+portage_prefix: releng

diff --git a/tools/catalyst-auto-qemu-riscv.conf b/tools/catalyst-auto-qemu-riscv.conf
index e55cd0e5..35279968 100644
--- a/tools/catalyst-auto-qemu-riscv.conf
+++ b/tools/catalyst-auto-qemu-riscv.conf
@@ -13,6 +13,8 @@ EMAIL_SUBJECT_PREPEND="[riscv-qemu-auto]"
 SETS="
 	lp64d_200_openrc
 	lp64d_200_systemd
+	lp64_200_openrc
+	lp64_200_systemd
 	lp64d
 	lp64
 	lp64d_systemd
@@ -27,6 +29,8 @@ SET_multilib_SPECS="stage1-multilib.spec stage3-multilib.spec"
 
 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"
+SET_lp64_200_systemd_SPECS="stage1-lp64-20.0-systemd.spec stage3-lp64-20.0-systemd.spec"
 
 SET_lp64d_SPECS="stage1-lp64d.spec stage3-lp64d.spec"
 SET_lp64_SPECS="stage1-lp64.spec stage3-lp64.spec"
@@ -38,7 +42,7 @@ 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" ; do
+	for d in "${BUILD_SRCDIR_BASE}/builds/default" "${BUILD_SRCDIR_BASE}/builds/20.0" ; 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)