aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas K. Hüttel <dilfridge@gentoo.org>2024-04-16 21:38:46 +1100
committerAndreas K. Hüttel <dilfridge@gentoo.org>2024-04-16 21:38:46 +1100
commit8a9b3d1982c074ebbde86b9a217c0d36f00fa9bc (patch)
tree2bee36b5be8ee4777ddea98a64c5833a0c1373bd
parentAlso unleash glibc-2.39 on non-qemu builds (diff)
downloadreleng-8a9b3d1982c074ebbde86b9a217c0d36f00fa9bc.tar.gz
releng-8a9b3d1982c074ebbde86b9a217c0d36f00fa9bc.tar.bz2
releng-8a9b3d1982c074ebbde86b9a217c0d36f00fa9bc.zip
Add and enable rv32 ilp32 builds
Signed-off-by: Andreas K. Hüttel <dilfridge@gentoo.org>
-rw-r--r--releases/specs-qemu/riscv/rv32_ilp32/stage1-ilp32-musl-23.spec14
-rw-r--r--releases/specs-qemu/riscv/rv32_ilp32/stage1-ilp32-openrc-23.spec14
-rw-r--r--releases/specs-qemu/riscv/rv32_ilp32/stage1-ilp32-systemd-23.spec14
-rw-r--r--releases/specs-qemu/riscv/rv32_ilp32/stage3-ilp32-musl-23.spec13
-rw-r--r--releases/specs-qemu/riscv/rv32_ilp32/stage3-ilp32-openrc-23.spec13
-rw-r--r--releases/specs-qemu/riscv/rv32_ilp32/stage3-ilp32-systemd-23.spec13
-rw-r--r--tools/catalyst-auto-qemu-riscv.conf18
7 files changed, 99 insertions, 0 deletions
diff --git a/releases/specs-qemu/riscv/rv32_ilp32/stage1-ilp32-musl-23.spec b/releases/specs-qemu/riscv/rv32_ilp32/stage1-ilp32-musl-23.spec
new file mode 100644
index 00000000..b7eb9101
--- /dev/null
+++ b/releases/specs-qemu/riscv/rv32_ilp32/stage1-ilp32-musl-23.spec
@@ -0,0 +1,14 @@
+subarch: rv32_ilp32_musl
+target: stage1
+version_stamp: @TIMESTAMP@
+interpreter: /usr/bin/qemu-riscv32
+rel_type: 23.0-musl
+profile: default/linux/riscv/23.0/rv32/ilp32/musl
+snapshot_treeish: @TREEISH@
+source_subpath: 23.0-musl/stage3-rv32_ilp32_musl-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/rv32_ilp32/stage1-ilp32-openrc-23.spec b/releases/specs-qemu/riscv/rv32_ilp32/stage1-ilp32-openrc-23.spec
new file mode 100644
index 00000000..35756978
--- /dev/null
+++ b/releases/specs-qemu/riscv/rv32_ilp32/stage1-ilp32-openrc-23.spec
@@ -0,0 +1,14 @@
+subarch: rv32_ilp32
+target: stage1
+version_stamp: openrc-@TIMESTAMP@
+interpreter: /usr/bin/qemu-riscv32
+rel_type: 23.0-default
+profile: default/linux/riscv/23.0/rv32/ilp32
+snapshot_treeish: @TREEISH@
+source_subpath: 23.0-default/stage3-rv32_ilp32-openrc-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/rv32_ilp32/stage1-ilp32-systemd-23.spec b/releases/specs-qemu/riscv/rv32_ilp32/stage1-ilp32-systemd-23.spec
new file mode 100644
index 00000000..86da765e
--- /dev/null
+++ b/releases/specs-qemu/riscv/rv32_ilp32/stage1-ilp32-systemd-23.spec
@@ -0,0 +1,14 @@
+subarch: rv32_ilp32
+target: stage1
+version_stamp: systemd-@TIMESTAMP@
+interpreter: /usr/bin/qemu-riscv32
+rel_type: 23.0-default
+profile: default/linux/riscv/23.0/rv32/ilp32/systemd
+snapshot_treeish: @TREEISH@
+source_subpath: 23.0-default/stage3-rv32_ilp32-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/rv32_ilp32/stage3-ilp32-musl-23.spec b/releases/specs-qemu/riscv/rv32_ilp32/stage3-ilp32-musl-23.spec
new file mode 100644
index 00000000..77b65c82
--- /dev/null
+++ b/releases/specs-qemu/riscv/rv32_ilp32/stage3-ilp32-musl-23.spec
@@ -0,0 +1,13 @@
+subarch: rv32_ilp32_musl
+target: stage3
+version_stamp: @TIMESTAMP@
+interpreter: /usr/bin/qemu-riscv32
+rel_type: 23.0-musl
+profile: default/linux/riscv/23.0/rv32/ilp32/musl
+snapshot_treeish: @TREEISH@
+source_subpath: 23.0-musl/stage1-rv32_ilp32_musl-@TIMESTAMP@
+compression_mode: pixz
+decompressor_search_order: xz bzip2
+portage_confdir: @REPO_DIR@/releases/portage/stages-qemu
+portage_prefix: releng
+binrepo_path: riscv/binpackages/23.0/rv32_ilp32_musl
diff --git a/releases/specs-qemu/riscv/rv32_ilp32/stage3-ilp32-openrc-23.spec b/releases/specs-qemu/riscv/rv32_ilp32/stage3-ilp32-openrc-23.spec
new file mode 100644
index 00000000..1fa517a0
--- /dev/null
+++ b/releases/specs-qemu/riscv/rv32_ilp32/stage3-ilp32-openrc-23.spec
@@ -0,0 +1,13 @@
+subarch: rv32_ilp32
+target: stage3
+version_stamp: openrc-@TIMESTAMP@
+interpreter: /usr/bin/qemu-riscv32
+rel_type: 23.0-default
+profile: default/linux/riscv/23.0/rv32/ilp32
+snapshot_treeish: @TREEISH@
+source_subpath: 23.0-default/stage1-rv32_ilp32-openrc-@TIMESTAMP@
+compression_mode: pixz
+decompressor_search_order: xz bzip2
+portage_confdir: @REPO_DIR@/releases/portage/stages-qemu
+portage_prefix: releng
+binrepo_path: riscv/binpackages/23.0/rv32_ilp32
diff --git a/releases/specs-qemu/riscv/rv32_ilp32/stage3-ilp32-systemd-23.spec b/releases/specs-qemu/riscv/rv32_ilp32/stage3-ilp32-systemd-23.spec
new file mode 100644
index 00000000..e6b64104
--- /dev/null
+++ b/releases/specs-qemu/riscv/rv32_ilp32/stage3-ilp32-systemd-23.spec
@@ -0,0 +1,13 @@
+subarch: rv32_ilp32
+target: stage3
+version_stamp: systemd-@TIMESTAMP@
+interpreter: /usr/bin/qemu-riscv32
+rel_type: 23.0-default
+profile: default/linux/riscv/23.0/rv32/ilp32/systemd
+snapshot_treeish: @TREEISH@
+source_subpath: 23.0-default/stage1-rv32_ilp32-systemd-@TIMESTAMP@
+compression_mode: pixz
+decompressor_search_order: xz bzip2
+portage_confdir: @REPO_DIR@/releases/portage/stages-qemu
+portage_prefix: releng
+binrepo_path: riscv/binpackages/23.0/rv32_ilp32
diff --git a/tools/catalyst-auto-qemu-riscv.conf b/tools/catalyst-auto-qemu-riscv.conf
index 7114c491..63d79a05 100644
--- a/tools/catalyst-auto-qemu-riscv.conf
+++ b/tools/catalyst-auto-qemu-riscv.conf
@@ -21,6 +21,8 @@ SETS="
multilib_systemd_23
ilp32d_openrc_23
ilp32d_systemd_23
+ ilp32_openrc_23
+ ilp32_systemd_23
lp64d_openrc
lp64d_musl
lp64_openrc
@@ -28,6 +30,7 @@ SETS="
multilib_openrc
"
# ilp32d_musl_23
+# ilp32_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"
@@ -52,6 +55,10 @@ SET_ilp32d_musl_23_SPECS="rv32_ilp32d/stage1-ilp32d-musl-23.spec rv32_ilp32d/sta
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"
+SET_ilp32_musl_23_SPECS="rv32_ilp32/stage1-ilp32-musl-23.spec rv32_ilp32/stage3-ilp32-musl-23.spec"
+SET_ilp32_openrc_23_SPECS="rv32_ilp32/stage1-ilp32-openrc-23.spec rv32_ilp32/stage3-ilp32-openrc-23.spec"
+SET_ilp32_systemd_23_SPECS="rv32_ilp32/stage1-ilp32-systemd-23.spec rv32_ilp32/stage3-ilp32-systemd-23.spec"
+
update_symlinks() {
# Symlink the latest stages3 to build from
local d f
@@ -111,6 +118,17 @@ post_build() {
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
;;
+ rv32_ilp32/stage3-ilp32-openrc-23.spec)
+ upload builds/23.0-default/stage3-rv32_ilp32-openrc-${TIMESTAMP}*.xz*
+ ;;
+ rv32_ilp32/stage3-ilp32-systemd-23.spec)
+ upload builds/23.0-default/stage3-rv32_ilp32-systemd-${TIMESTAMP}*.xz*
+ upsync_binpackages packages/23.0-default/stage3-rv32_ilp32 riscv/23.0/rv32_ilp32
+ ;;
+ rv32_ilp32/stage3-ilp32-musl-23.spec)
+ upload builds/23.0-musl/stage3-rv32_ilp32_musl-${TIMESTAMP}*.xz*
+ upsync_binpackages packages/23.0-musl/stage3-rv32_ilp32_musl riscv/23.0/rv32_ilp32_musl
+ ;;
stage3*openrc.spec)
upsync_binpackages packages/default/stage3-rv64_lp64d riscv/20.0/rv64_lp64d
upsync_binpackages packages/default/stage3-rv64_lp64 riscv/20.0/rv64_lp64