chadmed/gentoo-asahi-releng
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

riscv: skip stage2 everywhere, go stage1 -> stage3

Browse source 
Signed-off-by: Andreas K. Hüttel <dilfridge@gentoo.org>
This commit is contained in:
Andreas K. Hüttel 2021-06-16 23:28:27 +02:00
parent 5413402d5a
commit 79129d9161
No known key found for this signature in database
GPG key ID: 4C49F79E54D0A206
17 changed files with 16 additions and 120 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
releases/specs-qemu/riscv/stage2-ilp32.spec
View file

@ -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

13
releases/specs-qemu/riscv/stage2-lp64-systemd.spec
View file

@ -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

13
releases/specs-qemu/riscv/stage2-lp64.spec
View file

@ -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

13
releases/specs-qemu/riscv/stage2-lp64d-20.0-openrc.spec
View file

@ -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

13
releases/specs-qemu/riscv/stage2-lp64d-20.0-systemd.spec
View file

@ -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

13
releases/specs-qemu/riscv/stage2-lp64d-systemd.spec
View file

@ -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

13
releases/specs-qemu/riscv/stage2-lp64d.spec
View file

@ -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

13
releases/specs-qemu/riscv/stage2-multilib.spec
View file

@ -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

2
releases/specs-qemu/riscv/stage3-ilp32.spec
View file

@ -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

2
releases/specs-qemu/riscv/stage3-lp64-systemd.spec
View file

@ -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

2
releases/specs-qemu/riscv/stage3-lp64.spec
View file

@ -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

2
releases/specs-qemu/riscv/stage3-lp64d-20.0-openrc.spec
View file

@ -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

2
releases/specs-qemu/riscv/stage3-lp64d-20.0-systemd.spec
View file

@ -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

2
releases/specs-qemu/riscv/stage3-lp64d-systemd.spec
View file

@ -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

2
releases/specs-qemu/riscv/stage3-lp64d.spec
View file

@ -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

2
releases/specs-qemu/riscv/stage3-multilib.spec
View file

@ -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

16
tools/catalyst-auto-qemu-riscv.conf
View file

@ -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