commit: 7df0e0824b9268f10fac352289e7dd7af6fd816f
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Sat Jun 19 13:03:33 2021 +0000
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sat Jun 19 13:03:33 2021 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=7df0e082
riscv: stop 17.0 stage builds now that 20.0 works
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
releases/specs-qemu/riscv/stage1-lp64-systemd.spec | 15 ---------------
releases/specs-qemu/riscv/stage1-lp64.spec | 15 ---------------
releases/specs-qemu/riscv/stage1-lp64d-systemd.spec | 15 ---------------
releases/specs-qemu/riscv/stage1-lp64d.spec | 15 ---------------
releases/specs-qemu/riscv/stage1-multilib.spec | 15 ---------------
releases/specs-qemu/riscv/stage3-lp64-systemd.spec | 13 -------------
releases/specs-qemu/riscv/stage3-lp64.spec | 13 -------------
releases/specs-qemu/riscv/stage3-lp64d-systemd.spec | 13 -------------
releases/specs-qemu/riscv/stage3-lp64d.spec | 13 -------------
releases/specs-qemu/riscv/stage3-multilib.spec | 13 -------------
tools/catalyst-auto-qemu-riscv.conf | 9 ---------
11 files changed, 149 deletions(-)
diff --git a/releases/specs-qemu/riscv/stage1-lp64-systemd.spec
b/releases/specs-qemu/riscv/stage1-lp64-systemd.spec
deleted file mode 100644
index 38aa42a7..00000000
--- a/releases/specs-qemu/riscv/stage1-lp64-systemd.spec
+++ /dev/null
@@ -1,15 +0,0 @@
-subarch: rv64_lp64
-target: stage1
-version_stamp: systemd-@TIMESTAMP@
-cflags: -O2 -pipe
-interpreter: /usr/bin/qemu-riscv64
-rel_type: default
-profile: default/linux/riscv/17.0/rv64gc/lp64/systemd
-snapshot: @TIMESTAMP@
-source_subpath: default/stage3-rv64_lp64-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/stage1-lp64.spec
b/releases/specs-qemu/riscv/stage1-lp64.spec
deleted file mode 100644
index 699fbc22..00000000
--- a/releases/specs-qemu/riscv/stage1-lp64.spec
+++ /dev/null
@@ -1,15 +0,0 @@
-subarch: rv64_lp64
-target: stage1
-version_stamp: @TIMESTAMP@
-cflags: -O2 -pipe
-interpreter: /usr/bin/qemu-riscv64
-rel_type: default
-profile: default/linux/riscv/17.0/rv64gc/lp64
-snapshot: @TIMESTAMP@
-source_subpath: default/stage3-rv64_lp64-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-lp64d-systemd.spec
b/releases/specs-qemu/riscv/stage1-lp64d-systemd.spec
deleted file mode 100644
index 17df7d5b..00000000
--- a/releases/specs-qemu/riscv/stage1-lp64d-systemd.spec
+++ /dev/null
@@ -1,15 +0,0 @@
-subarch: rv64_lp64d
-target: stage1
-version_stamp: systemd-@TIMESTAMP@
-cflags: -O2 -pipe
-interpreter: /usr/bin/qemu-riscv64
-rel_type: default
-profile: default/linux/riscv/17.0/rv64gc/lp64d/systemd
-snapshot: @TIMESTAMP@
-source_subpath: default/stage3-rv64_lp64d-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/stage1-lp64d.spec
b/releases/specs-qemu/riscv/stage1-lp64d.spec
deleted file mode 100644
index bebc911c..00000000
--- a/releases/specs-qemu/riscv/stage1-lp64d.spec
+++ /dev/null
@@ -1,15 +0,0 @@
-subarch: rv64_lp64d
-target: stage1
-version_stamp: @TIMESTAMP@
-cflags: -O2 -pipe
-interpreter: /usr/bin/qemu-riscv64
-rel_type: default
-profile: default/linux/riscv/17.0/rv64gc/lp64d
-snapshot: @TIMESTAMP@
-source_subpath: default/stage3-rv64_lp64d-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-multilib.spec
b/releases/specs-qemu/riscv/stage1-multilib.spec
deleted file mode 100644
index ae25631d..00000000
--- a/releases/specs-qemu/riscv/stage1-multilib.spec
+++ /dev/null
@@ -1,15 +0,0 @@
-subarch: rv64_multilib
-target: stage1
-version_stamp: @TIMESTAMP@
-cflags: -O2 -pipe -g
-interpreter: /usr/bin/qemu-riscv64 /usr/bin/qemu-riscv32
-rel_type: default
-profile: default/linux/riscv/17.0/rv64gc
-snapshot: @TIMESTAMP@
-source_subpath: default/stage3-rv64_multilib-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-systemd.spec
b/releases/specs-qemu/riscv/stage3-lp64-systemd.spec
deleted file mode 100644
index 873acc29..00000000
--- a/releases/specs-qemu/riscv/stage3-lp64-systemd.spec
+++ /dev/null
@@ -1,13 +0,0 @@
-subarch: rv64_lp64
-target: stage3
-version_stamp: systemd-@TIMESTAMP@
-cflags: -O2 -pipe
-interpreter: /usr/bin/qemu-riscv64
-rel_type: default
-profile: default/linux/riscv/17.0/rv64gc/lp64/systemd
-snapshot: @TIMESTAMP@
-source_subpath: default/stage1-rv64_lp64-systemd-@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.spec
b/releases/specs-qemu/riscv/stage3-lp64.spec
deleted file mode 100644
index 708c8b58..00000000
--- a/releases/specs-qemu/riscv/stage3-lp64.spec
+++ /dev/null
@@ -1,13 +0,0 @@
-subarch: rv64_lp64
-target: stage3
-version_stamp: @TIMESTAMP@
-cflags: -O2 -pipe
-interpreter: /usr/bin/qemu-riscv64
-rel_type: default
-profile: default/linux/riscv/17.0/rv64gc/lp64
-snapshot: @TIMESTAMP@
-source_subpath: default/stage1-rv64_lp64-@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-lp64d-systemd.spec
b/releases/specs-qemu/riscv/stage3-lp64d-systemd.spec
deleted file mode 100644
index 075c5b15..00000000
--- a/releases/specs-qemu/riscv/stage3-lp64d-systemd.spec
+++ /dev/null
@@ -1,13 +0,0 @@
-subarch: rv64_lp64d
-target: stage3
-version_stamp: systemd-@TIMESTAMP@
-cflags: -O2 -pipe
-interpreter: /usr/bin/qemu-riscv64
-rel_type: default
-profile: default/linux/riscv/17.0/rv64gc/lp64d/systemd
-snapshot: @TIMESTAMP@
-source_subpath: default/stage1-rv64_lp64d-systemd-@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-lp64d.spec
b/releases/specs-qemu/riscv/stage3-lp64d.spec
deleted file mode 100644
index 22861abc..00000000
--- a/releases/specs-qemu/riscv/stage3-lp64d.spec
+++ /dev/null
@@ -1,13 +0,0 @@
-subarch: rv64_lp64d
-target: stage3
-version_stamp: @TIMESTAMP@
-cflags: -O2 -pipe
-interpreter: /usr/bin/qemu-riscv64
-rel_type: default
-profile: default/linux/riscv/17.0/rv64gc/lp64d
-snapshot: @TIMESTAMP@
-source_subpath: default/stage1-rv64_lp64d-@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-multilib.spec
b/releases/specs-qemu/riscv/stage3-multilib.spec
deleted file mode 100644
index b6458820..00000000
--- a/releases/specs-qemu/riscv/stage3-multilib.spec
+++ /dev/null
@@ -1,13 +0,0 @@
-subarch: rv64_multilib
-target: stage3
-version_stamp: @TIMESTAMP@
-cflags: -O2 -pipe -g
-interpreter: /usr/bin/qemu-riscv64 /usr/bin/qemu-riscv32
-rel_type: default
-profile: default/linux/riscv/17.0/rv64gc
-snapshot: @TIMESTAMP@
-source_subpath: default/stage1-rv64_multilib-@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 35279968..146a43f0 100644
--- a/tools/catalyst-auto-qemu-riscv.conf
+++ b/tools/catalyst-auto-qemu-riscv.conf
@@ -15,10 +15,6 @@ SETS="
lp64d_200_systemd
lp64_200_openrc
lp64_200_systemd
- lp64d
- lp64
- lp64d_systemd
- lp64_systemd
"
# riscv32 does not work yet
@@ -32,11 +28,6 @@ SET_lp64d_200_systemd_SPECS="stage1-lp64d-20.0-systemd.spec
stage3-lp64d-20.0-sy
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"
-SET_lp64d_systemd_SPECS="stage1-lp64d-systemd.spec stage3-lp64d-systemd.spec"
-SET_lp64_systemd_SPECS="stage1-lp64-systemd.spec stage3-lp64-systemd.spec"
-
SET_ilp32_SPECS="stage1-ilp32.spec stage3-ilp32.spec"
update_symlinks() {
