commit: adfc9e915ee5b91d894a9f435ecfbece1f158b9e
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Sat Aug 21 21:45:34 2021 +0000
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sat Aug 21 21:45:34 2021 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=adfc9e91
Rename riscv stage names to drop profile version
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
...64-20.0-openrc.spec => stage1-lp64-openrc.spec} | 0
...-20.0-systemd.spec => stage1-lp64-systemd.spec} | 0
...d-20.0-openrc.spec => stage1-lp64d-openrc.spec} | 0
...20.0-systemd.spec => stage1-lp64d-systemd.spec} | 0
...0.0-openrc.spec => stage1-multilib-openrc.spec} | 0
...0-systemd.spec => stage1-multilib-systemd.spec} | 0
...64-20.0-openrc.spec => stage3-lp64-openrc.spec} | 0
...-20.0-systemd.spec => stage3-lp64-systemd.spec} | 0
...d-20.0-openrc.spec => stage3-lp64d-openrc.spec} | 0
...20.0-systemd.spec => stage3-lp64d-systemd.spec} | 0
...0.0-openrc.spec => stage3-multilib-openrc.spec} | 0
...0-systemd.spec => stage3-multilib-systemd.spec} | 0
tools/catalyst-auto-qemu-riscv.conf | 24 +++++++++++-----------
13 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/releases/specs-qemu/riscv/stage1-lp64-20.0-openrc.spec
b/releases/specs-qemu/riscv/stage1-lp64-openrc.spec
similarity index 100%
rename from releases/specs-qemu/riscv/stage1-lp64-20.0-openrc.spec
rename to releases/specs-qemu/riscv/stage1-lp64-openrc.spec
diff --git a/releases/specs-qemu/riscv/stage1-lp64-20.0-systemd.spec
b/releases/specs-qemu/riscv/stage1-lp64-systemd.spec
similarity index 100%
rename from releases/specs-qemu/riscv/stage1-lp64-20.0-systemd.spec
rename to releases/specs-qemu/riscv/stage1-lp64-systemd.spec
diff --git a/releases/specs-qemu/riscv/stage1-lp64d-20.0-openrc.spec
b/releases/specs-qemu/riscv/stage1-lp64d-openrc.spec
similarity index 100%
rename from releases/specs-qemu/riscv/stage1-lp64d-20.0-openrc.spec
rename to releases/specs-qemu/riscv/stage1-lp64d-openrc.spec
diff --git a/releases/specs-qemu/riscv/stage1-lp64d-20.0-systemd.spec
b/releases/specs-qemu/riscv/stage1-lp64d-systemd.spec
similarity index 100%
rename from releases/specs-qemu/riscv/stage1-lp64d-20.0-systemd.spec
rename to releases/specs-qemu/riscv/stage1-lp64d-systemd.spec
diff --git a/releases/specs-qemu/riscv/stage1-multilib-20.0-openrc.spec
b/releases/specs-qemu/riscv/stage1-multilib-openrc.spec
similarity index 100%
rename from releases/specs-qemu/riscv/stage1-multilib-20.0-openrc.spec
rename to releases/specs-qemu/riscv/stage1-multilib-openrc.spec
diff --git a/releases/specs-qemu/riscv/stage1-multilib-20.0-systemd.spec
b/releases/specs-qemu/riscv/stage1-multilib-systemd.spec
similarity index 100%
rename from releases/specs-qemu/riscv/stage1-multilib-20.0-systemd.spec
rename to releases/specs-qemu/riscv/stage1-multilib-systemd.spec
diff --git a/releases/specs-qemu/riscv/stage3-lp64-20.0-openrc.spec
b/releases/specs-qemu/riscv/stage3-lp64-openrc.spec
similarity index 100%
rename from releases/specs-qemu/riscv/stage3-lp64-20.0-openrc.spec
rename to releases/specs-qemu/riscv/stage3-lp64-openrc.spec
diff --git a/releases/specs-qemu/riscv/stage3-lp64-20.0-systemd.spec
b/releases/specs-qemu/riscv/stage3-lp64-systemd.spec
similarity index 100%
rename from releases/specs-qemu/riscv/stage3-lp64-20.0-systemd.spec
rename to releases/specs-qemu/riscv/stage3-lp64-systemd.spec
diff --git a/releases/specs-qemu/riscv/stage3-lp64d-20.0-openrc.spec
b/releases/specs-qemu/riscv/stage3-lp64d-openrc.spec
similarity index 100%
rename from releases/specs-qemu/riscv/stage3-lp64d-20.0-openrc.spec
rename to releases/specs-qemu/riscv/stage3-lp64d-openrc.spec
diff --git a/releases/specs-qemu/riscv/stage3-lp64d-20.0-systemd.spec
b/releases/specs-qemu/riscv/stage3-lp64d-systemd.spec
similarity index 100%
rename from releases/specs-qemu/riscv/stage3-lp64d-20.0-systemd.spec
rename to releases/specs-qemu/riscv/stage3-lp64d-systemd.spec
diff --git a/releases/specs-qemu/riscv/stage3-multilib-20.0-openrc.spec
b/releases/specs-qemu/riscv/stage3-multilib-openrc.spec
similarity index 100%
rename from releases/specs-qemu/riscv/stage3-multilib-20.0-openrc.spec
rename to releases/specs-qemu/riscv/stage3-multilib-openrc.spec
diff --git a/releases/specs-qemu/riscv/stage3-multilib-20.0-systemd.spec
b/releases/specs-qemu/riscv/stage3-multilib-systemd.spec
similarity index 100%
rename from releases/specs-qemu/riscv/stage3-multilib-20.0-systemd.spec
rename to releases/specs-qemu/riscv/stage3-multilib-systemd.spec
diff --git a/tools/catalyst-auto-qemu-riscv.conf
b/tools/catalyst-auto-qemu-riscv.conf
index 6a03879b..9d634695 100644
--- a/tools/catalyst-auto-qemu-riscv.conf
+++ b/tools/catalyst-auto-qemu-riscv.conf
@@ -11,20 +11,20 @@ SPECS_DIR=${REPO_DIR}/releases/specs-qemu/riscv
EMAIL_SUBJECT_PREPEND="[riscv-qemu-auto]"
SETS="
- lp64d_200_openrc
- lp64d_200_systemd
- lp64_200_openrc
- lp64_200_systemd
- multilib_200_openrc
- multilib_200_systemd
+ lp64d_openrc
+ lp64d_systemd
+ lp64_openrc
+ lp64_systemd
+ multilib_openrc
+ multilib_systemd
"
-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_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_lp64d_openrc_SPECS="stage1-lp64d-openrc.spec stage3-lp64d-openrc.spec"
+SET_lp64d_systemd_SPECS="stage1-lp64d-systemd.spec stage3-lp64d-systemd.spec"
+SET_lp64_openrc_SPECS="stage1-lp64-openrc.spec stage3-lp64-openrc.spec"
+SET_lp64_systemd_SPECS="stage1-lp64-systemd.spec stage3-lp64-systemd.spec"
+SET_multilib_openrc_SPECS="stage1-multilib-openrc.spec
stage3-multilib-openrc.spec"
+SET_multilib_systemd_SPECS="stage1-multilib-systemd.spec
stage3-multilib-systemd.spec"
update_symlinks() {
# Symlink the latest stages3 to build from
