From 79129d9161c0bdf4ee617ce4a9f5299d7f646765 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20K=2E=20H=C3=BCttel?= Date: Wed, 16 Jun 2021 23:28:27 +0200 Subject: [PATCH] riscv: skip stage2 everywhere, go stage1 -> stage3 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Andreas K. Hüttel --- releases/specs-qemu/riscv/stage2-ilp32.spec | 13 ------------- .../specs-qemu/riscv/stage2-lp64-systemd.spec | 13 ------------- releases/specs-qemu/riscv/stage2-lp64.spec | 13 ------------- .../riscv/stage2-lp64d-20.0-openrc.spec | 13 ------------- .../riscv/stage2-lp64d-20.0-systemd.spec | 13 ------------- .../specs-qemu/riscv/stage2-lp64d-systemd.spec | 13 ------------- releases/specs-qemu/riscv/stage2-lp64d.spec | 13 ------------- releases/specs-qemu/riscv/stage2-multilib.spec | 13 ------------- releases/specs-qemu/riscv/stage3-ilp32.spec | 2 +- .../specs-qemu/riscv/stage3-lp64-systemd.spec | 2 +- releases/specs-qemu/riscv/stage3-lp64.spec | 2 +- .../riscv/stage3-lp64d-20.0-openrc.spec | 2 +- .../riscv/stage3-lp64d-20.0-systemd.spec | 2 +- .../specs-qemu/riscv/stage3-lp64d-systemd.spec | 2 +- releases/specs-qemu/riscv/stage3-lp64d.spec | 2 +- releases/specs-qemu/riscv/stage3-multilib.spec | 2 +- tools/catalyst-auto-qemu-riscv.conf | 16 ++++++++-------- 17 files changed, 16 insertions(+), 120 deletions(-) delete mode 100644 releases/specs-qemu/riscv/stage2-ilp32.spec delete mode 100644 releases/specs-qemu/riscv/stage2-lp64-systemd.spec delete mode 100644 releases/specs-qemu/riscv/stage2-lp64.spec delete mode 100644 releases/specs-qemu/riscv/stage2-lp64d-20.0-openrc.spec delete mode 100644 releases/specs-qemu/riscv/stage2-lp64d-20.0-systemd.spec delete mode 100644 releases/specs-qemu/riscv/stage2-lp64d-systemd.spec delete mode 100644 releases/specs-qemu/riscv/stage2-lp64d.spec delete mode 100644 releases/specs-qemu/riscv/stage2-multilib.spec diff --git a/releases/specs-qemu/riscv/stage2-ilp32.spec b/releases/specs-qemu/riscv/stage2-ilp32.spec deleted file mode 100644 index c1ffdbf7..00000000 --- a/releases/specs-qemu/riscv/stage2-ilp32.spec +++ /dev/null @@ -1,13 +0,0 @@ -subarch: rv32_ilp32 -target: stage2 -version_stamp: @TIMESTAMP@ -cflags: -O2 -pipe -interpreter: /usr/bin/qemu-riscv32 -rel_type: default -profile: default/linux/riscv/17.0/rv32imac/ilp32 -snapshot: @TIMESTAMP@ -source_subpath: default/stage1-rv32_ilp32-@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/stage2-lp64-systemd.spec b/releases/specs-qemu/riscv/stage2-lp64-systemd.spec deleted file mode 100644 index 7b44190a..00000000 --- a/releases/specs-qemu/riscv/stage2-lp64-systemd.spec +++ /dev/null @@ -1,13 +0,0 @@ -subarch: rv64_lp64 -target: stage2 -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/stage2-lp64.spec b/releases/specs-qemu/riscv/stage2-lp64.spec deleted file mode 100644 index 0754a68a..00000000 --- a/releases/specs-qemu/riscv/stage2-lp64.spec +++ /dev/null @@ -1,13 +0,0 @@ -subarch: rv64_lp64 -target: stage2 -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/stage2-lp64d-20.0-openrc.spec b/releases/specs-qemu/riscv/stage2-lp64d-20.0-openrc.spec deleted file mode 100644 index 241ace4d..00000000 --- a/releases/specs-qemu/riscv/stage2-lp64d-20.0-openrc.spec +++ /dev/null @@ -1,13 +0,0 @@ -subarch: rv64_lp64d -target: stage2 -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/lp64d -snapshot: @TIMESTAMP@ -source_subpath: 20.0/stage1-rv64_lp64d-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/stage2-lp64d-20.0-systemd.spec b/releases/specs-qemu/riscv/stage2-lp64d-20.0-systemd.spec deleted file mode 100644 index 4685179c..00000000 --- a/releases/specs-qemu/riscv/stage2-lp64d-20.0-systemd.spec +++ /dev/null @@ -1,13 +0,0 @@ -subarch: rv64_lp64d -target: stage2 -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/lp64d/systemd -snapshot: @TIMESTAMP@ -source_subpath: 20.0/stage1-rv64_lp64d-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/releases/specs-qemu/riscv/stage2-lp64d-systemd.spec b/releases/specs-qemu/riscv/stage2-lp64d-systemd.spec deleted file mode 100644 index 06d89a6b..00000000 --- a/releases/specs-qemu/riscv/stage2-lp64d-systemd.spec +++ /dev/null @@ -1,13 +0,0 @@ -subarch: rv64_lp64d -target: stage2 -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/stage2-lp64d.spec b/releases/specs-qemu/riscv/stage2-lp64d.spec deleted file mode 100644 index 6a231f87..00000000 --- a/releases/specs-qemu/riscv/stage2-lp64d.spec +++ /dev/null @@ -1,13 +0,0 @@ -subarch: rv64_lp64d -target: stage2 -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/stage2-multilib.spec b/releases/specs-qemu/riscv/stage2-multilib.spec deleted file mode 100644 index 05ce3407..00000000 --- a/releases/specs-qemu/riscv/stage2-multilib.spec +++ /dev/null @@ -1,13 +0,0 @@ -subarch: rv64_multilib -target: stage2 -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/releases/specs-qemu/riscv/stage3-ilp32.spec b/releases/specs-qemu/riscv/stage3-ilp32.spec index b477807e..36921587 100644 --- a/releases/specs-qemu/riscv/stage3-ilp32.spec +++ b/releases/specs-qemu/riscv/stage3-ilp32.spec @@ -6,7 +6,7 @@ interpreter: /usr/bin/qemu-riscv32 rel_type: default profile: default/linux/riscv/17.0/rv32imac/ilp32 snapshot: @TIMESTAMP@ -source_subpath: default/stage2-rv32_ilp32-@TIMESTAMP@ +source_subpath: default/stage1-rv32_ilp32-@TIMESTAMP@ compression_mode: pixz decompressor_search_order: xz bzip2 portage_confdir: @REPO_DIR@/releases/portage/stages-qemu diff --git a/releases/specs-qemu/riscv/stage3-lp64-systemd.spec b/releases/specs-qemu/riscv/stage3-lp64-systemd.spec index 5f916ecb..873acc29 100644 --- a/releases/specs-qemu/riscv/stage3-lp64-systemd.spec +++ b/releases/specs-qemu/riscv/stage3-lp64-systemd.spec @@ -6,7 +6,7 @@ interpreter: /usr/bin/qemu-riscv64 rel_type: default profile: default/linux/riscv/17.0/rv64gc/lp64/systemd snapshot: @TIMESTAMP@ -source_subpath: default/stage2-rv64_lp64-systemd-@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 diff --git a/releases/specs-qemu/riscv/stage3-lp64.spec b/releases/specs-qemu/riscv/stage3-lp64.spec index 79315ba0..708c8b58 100644 --- a/releases/specs-qemu/riscv/stage3-lp64.spec +++ b/releases/specs-qemu/riscv/stage3-lp64.spec @@ -6,7 +6,7 @@ interpreter: /usr/bin/qemu-riscv64 rel_type: default profile: default/linux/riscv/17.0/rv64gc/lp64 snapshot: @TIMESTAMP@ -source_subpath: default/stage2-rv64_lp64-@TIMESTAMP@ +source_subpath: default/stage1-rv64_lp64-@TIMESTAMP@ compression_mode: pixz decompressor_search_order: xz bzip2 portage_confdir: @REPO_DIR@/releases/portage/stages-qemu diff --git a/releases/specs-qemu/riscv/stage3-lp64d-20.0-openrc.spec b/releases/specs-qemu/riscv/stage3-lp64d-20.0-openrc.spec index f4f1c8a0..56850d34 100644 --- a/releases/specs-qemu/riscv/stage3-lp64d-20.0-openrc.spec +++ b/releases/specs-qemu/riscv/stage3-lp64d-20.0-openrc.spec @@ -6,7 +6,7 @@ interpreter: /usr/bin/qemu-riscv64 rel_type: 20.0 profile: default/linux/riscv/20.0/rv64gc/lp64d snapshot: @TIMESTAMP@ -source_subpath: 20.0/stage2-rv64_lp64d-20.0-openrc-@TIMESTAMP@ +source_subpath: 20.0/stage1-rv64_lp64d-20.0-openrc-@TIMESTAMP@ compression_mode: pixz decompressor_search_order: xz bzip2 portage_confdir: @REPO_DIR@/releases/portage/stages-qemu diff --git a/releases/specs-qemu/riscv/stage3-lp64d-20.0-systemd.spec b/releases/specs-qemu/riscv/stage3-lp64d-20.0-systemd.spec index 77d57710..278ceb87 100644 --- a/releases/specs-qemu/riscv/stage3-lp64d-20.0-systemd.spec +++ b/releases/specs-qemu/riscv/stage3-lp64d-20.0-systemd.spec @@ -6,7 +6,7 @@ interpreter: /usr/bin/qemu-riscv64 rel_type: 20.0 profile: default/linux/riscv/20.0/rv64gc/lp64d/systemd snapshot: @TIMESTAMP@ -source_subpath: 20.0/stage2-rv64_lp64d-20.0-systemd-@TIMESTAMP@ +source_subpath: 20.0/stage1-rv64_lp64d-20.0-systemd-@TIMESTAMP@ compression_mode: pixz decompressor_search_order: xz bzip2 portage_confdir: @REPO_DIR@/releases/portage/stages-qemu diff --git a/releases/specs-qemu/riscv/stage3-lp64d-systemd.spec b/releases/specs-qemu/riscv/stage3-lp64d-systemd.spec index 21e8096e..075c5b15 100644 --- a/releases/specs-qemu/riscv/stage3-lp64d-systemd.spec +++ b/releases/specs-qemu/riscv/stage3-lp64d-systemd.spec @@ -6,7 +6,7 @@ interpreter: /usr/bin/qemu-riscv64 rel_type: default profile: default/linux/riscv/17.0/rv64gc/lp64d/systemd snapshot: @TIMESTAMP@ -source_subpath: default/stage2-rv64_lp64d-systemd-@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 diff --git a/releases/specs-qemu/riscv/stage3-lp64d.spec b/releases/specs-qemu/riscv/stage3-lp64d.spec index 55b252fd..22861abc 100644 --- a/releases/specs-qemu/riscv/stage3-lp64d.spec +++ b/releases/specs-qemu/riscv/stage3-lp64d.spec @@ -6,7 +6,7 @@ interpreter: /usr/bin/qemu-riscv64 rel_type: default profile: default/linux/riscv/17.0/rv64gc/lp64d snapshot: @TIMESTAMP@ -source_subpath: default/stage2-rv64_lp64d-@TIMESTAMP@ +source_subpath: default/stage1-rv64_lp64d-@TIMESTAMP@ compression_mode: pixz decompressor_search_order: xz bzip2 portage_confdir: @REPO_DIR@/releases/portage/stages-qemu diff --git a/releases/specs-qemu/riscv/stage3-multilib.spec b/releases/specs-qemu/riscv/stage3-multilib.spec index 289bc34a..b6458820 100644 --- a/releases/specs-qemu/riscv/stage3-multilib.spec +++ b/releases/specs-qemu/riscv/stage3-multilib.spec @@ -6,7 +6,7 @@ interpreter: /usr/bin/qemu-riscv64 /usr/bin/qemu-riscv32 rel_type: default profile: default/linux/riscv/17.0/rv64gc snapshot: @TIMESTAMP@ -source_subpath: default/stage2-rv64_multilib-@TIMESTAMP@ +source_subpath: default/stage1-rv64_multilib-@TIMESTAMP@ compression_mode: pixz decompressor_search_order: xz bzip2 portage_confdir: @REPO_DIR@/releases/portage/stages-qemu diff --git a/tools/catalyst-auto-qemu-riscv.conf b/tools/catalyst-auto-qemu-riscv.conf index a1ebcf8e..e55cd0e5 100644 --- a/tools/catalyst-auto-qemu-riscv.conf +++ b/tools/catalyst-auto-qemu-riscv.conf @@ -23,17 +23,17 @@ SETS=" # ilp32 # multilib needs re-bootstrapping -SET_multilib_SPECS="stage1-multilib.spec stage2-multilib.spec stage3-multilib.spec" +SET_multilib_SPECS="stage1-multilib.spec stage3-multilib.spec" -SET_lp64d_200_openrc_SPECS="stage1-lp64d-20.0-openrc.spec stage2-lp64d-20.0-openrc.spec stage3-lp64d-20.0-openrc.spec" -SET_lp64d_200_systemd_SPECS="stage1-lp64d-20.0-systemd.spec stage2-lp64d-20.0-systemd.spec stage3-lp64d-20.0-systemd.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_lp64d_SPECS="stage1-lp64d.spec stage2-lp64d.spec stage3-lp64d.spec" -SET_lp64_SPECS="stage1-lp64.spec stage2-lp64.spec stage3-lp64.spec" -SET_lp64d_systemd_SPECS="stage1-lp64d-systemd.spec stage2-lp64d-systemd.spec stage3-lp64d-systemd.spec" -SET_lp64_systemd_SPECS="stage1-lp64-systemd.spec stage2-lp64-systemd.spec stage3-lp64-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 stage2-ilp32.spec stage3-ilp32.spec" +SET_ilp32_SPECS="stage1-ilp32.spec stage3-ilp32.spec" update_symlinks() { # Symlink the latest stages3 to build from