From fe65e350f95103437e322c9e149840760553561a Mon Sep 17 00:00:00 2001 From: "Andreas K. Hüttel" Date: Sat, 6 Apr 2024 16:35:19 +0200 Subject: Enable riscv RV32 ILP32D builds MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Andreas K. Hüttel --- tools/catalyst-auto-qemu-riscv.conf | 30 ++++++++++++++++++++++++------ 1 file changed, 24 insertions(+), 6 deletions(-) diff --git a/tools/catalyst-auto-qemu-riscv.conf b/tools/catalyst-auto-qemu-riscv.conf index 328b500a..7114c491 100644 --- a/tools/catalyst-auto-qemu-riscv.conf +++ b/tools/catalyst-auto-qemu-riscv.conf @@ -19,12 +19,15 @@ SETS=" lp64_musl_23 multilib_openrc_23 multilib_systemd_23 + ilp32d_openrc_23 + ilp32d_systemd_23 lp64d_openrc lp64d_musl lp64_openrc lp64_musl multilib_openrc " +# ilp32d_musl_23 SET_lp64d_musl_SPECS="stage1-lp64d-musl.spec stage3-lp64d-musl.spec" SET_lp64d_openrc_SPECS="stage1-lp64d-openrc.spec stage3-lp64d-openrc.spec" @@ -45,6 +48,10 @@ SET_lp64_systemd_23_SPECS="stage1-lp64-systemd-23.spec stage3-lp64-systemd-23.sp SET_multilib_openrc_23_SPECS="stage1-multilib-openrc-23.spec stage3-multilib-openrc-23.spec" SET_multilib_systemd_23_SPECS="stage1-multilib-systemd-23.spec stage3-multilib-systemd-23.spec" +SET_ilp32d_musl_23_SPECS="rv32_ilp32d/stage1-ilp32d-musl-23.spec rv32_ilp32d/stage3-ilp32d-musl-23.spec" +SET_ilp32d_openrc_23_SPECS="rv32_ilp32d/stage1-ilp32d-openrc-23.spec rv32_ilp32d/stage3-ilp32d-openrc-23.spec" +SET_ilp32d_systemd_23_SPECS="rv32_ilp32d/stage1-ilp32d-systemd-23.spec rv32_ilp32d/stage3-ilp32d-systemd-23.spec" + update_symlinks() { # Symlink the latest stages3 to build from local d f @@ -71,6 +78,10 @@ post_build() { upload builds/23.0-default/stage3-rv64_lp64d-systemd-${TIMESTAMP}*.xz* upsync_binpackages packages/23.0-default/stage3-rv64_lp64d riscv/23.0/rv64_lp64d ;; + stage3-lp64d-musl-23.spec) + upload builds/23.0-musl/stage3-rv64_lp64d_musl-${TIMESTAMP}*.xz* + upsync_binpackages packages/23.0-musl/stage3-rv64_lp64d_musl riscv/23.0/rv64_lp64d_musl + ;; stage3-lp64-openrc-23.spec) upload builds/23.0-default/stage3-rv64_lp64-openrc-${TIMESTAMP}*.xz* ;; @@ -78,6 +89,10 @@ post_build() { upload builds/23.0-default/stage3-rv64_lp64-systemd-${TIMESTAMP}*.xz* upsync_binpackages packages/23.0-default/stage3-rv64_lp64 riscv/23.0/rv64_lp64 ;; + stage3-lp64-musl-23.spec) + upload builds/23.0-musl/stage3-rv64_lp64_musl-${TIMESTAMP}*.xz* + upsync_binpackages packages/23.0-musl/stage3-rv64_lp64_musl riscv/23.0/rv64_lp64_musl + ;; stage3-multilib-openrc-23.spec) upload builds/23.0-default/stage3-rv64_multilib-openrc-${TIMESTAMP}*.xz* ;; @@ -85,13 +100,16 @@ post_build() { upload builds/23.0-default/stage3-rv64_multilib-systemd-${TIMESTAMP}*.xz* upsync_binpackages packages/23.0-default/stage3-rv64_multilib riscv/23.0/rv64_multilib ;; - stage3-lp64d-musl-23.spec) - upload builds/23.0-musl/stage3-rv64_lp64d_musl-${TIMESTAMP}*.xz* - upsync_binpackages packages/23.0-musl/stage3-rv64_lp64d_musl riscv/23.0/rv64_lp64d_musl + rv32_ilp32d/stage3-ilp32d-openrc-23.spec) + upload builds/23.0-default/stage3-rv32_ilp32d-openrc-${TIMESTAMP}*.xz* ;; - stage3-lp64-musl-23.spec) - upload builds/23.0-musl/stage3-rv64_lp64_musl-${TIMESTAMP}*.xz* - upsync_binpackages packages/23.0-musl/stage3-rv64_lp64_musl riscv/23.0/rv64_lp64_musl + rv32_ilp32d/stage3-ilp32d-systemd-23.spec) + upload builds/23.0-default/stage3-rv32_ilp32d-systemd-${TIMESTAMP}*.xz* + upsync_binpackages packages/23.0-default/stage3-rv32_ilp32d riscv/23.0/rv32_ilp32d + ;; + rv32_ilp32d/stage3-ilp32d-musl-23.spec) + upload builds/23.0-musl/stage3-rv32_ilp32d_musl-${TIMESTAMP}*.xz* + upsync_binpackages packages/23.0-musl/stage3-rv32_ilp32d_musl riscv/23.0/rv32_ilp32d_musl ;; stage3*openrc.spec) upsync_binpackages packages/default/stage3-rv64_lp64d riscv/20.0/rv64_lp64d -- cgit v1.2.3-65-gdbad