commit: fd1b517f63415246ef26a59d7340ea4ea674faa9
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Thu Feb 5 16:55:34 2026 +0000
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Thu Feb 5 16:55:34 2026 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=fd1b517f
Add riscv musl/systemd builds
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
.../stage1-lp64-musl-openrc-23.spec} | 0
.../stage1-lp64-musl-systemd-23.spec} | 6 +--
.../stage3-lp64-musl-openrc-23.spec} | 0
.../stage3-lp64-musl-systemd-23.spec} | 6 +--
.../stage1-lp64d-musl-openrc-23.spec} | 0
.../stage1-lp64d-musl-systemd-23.spec} | 6 +--
.../stage3-lp64d-musl-openrc-23.spec} | 0
.../stage3-lp64d-musl-systemd-23.spec} | 6 +--
tools/catalyst-auto-qemu-riscv.conf | 44 ++++++++++++++++------
9 files changed, 44 insertions(+), 24 deletions(-)
diff --git a/releases/specs-qemu/riscv/stage1-lp64-musl-23.spec
b/releases/specs-qemu/riscv/rv64_lp64/stage1-lp64-musl-openrc-23.spec
similarity index 100%
copy from releases/specs-qemu/riscv/stage1-lp64-musl-23.spec
copy to releases/specs-qemu/riscv/rv64_lp64/stage1-lp64-musl-openrc-23.spec
diff --git a/releases/specs-qemu/riscv/stage1-lp64-musl-23.spec
b/releases/specs-qemu/riscv/rv64_lp64/stage1-lp64-musl-systemd-23.spec
similarity index 69%
rename from releases/specs-qemu/riscv/stage1-lp64-musl-23.spec
rename to releases/specs-qemu/riscv/rv64_lp64/stage1-lp64-musl-systemd-23.spec
index 2e1bf6be..52ad813b 100644
--- a/releases/specs-qemu/riscv/stage1-lp64-musl-23.spec
+++ b/releases/specs-qemu/riscv/rv64_lp64/stage1-lp64-musl-systemd-23.spec
@@ -1,12 +1,12 @@
subarch: rv64_lp64_musl
target: stage1
chost: riscv64-unknown-linux-musl
-version_stamp: openrc-@TIMESTAMP@
+version_stamp: systemd-@TIMESTAMP@
interpreter: /usr/bin/qemu-riscv64
rel_type: 23.0-musl
-profile: default/linux/riscv/23.0/rv64/lp64/musl
+profile: default/linux/riscv/23.0/rv64/lp64/musl/systemd
snapshot_treeish: @TREEISH@
-source_subpath: 23.0-musl/stage3-rv64_lp64_musl-openrc-latest
+source_subpath: 23.0-musl/stage3-rv64_lp64_musl-systemd-latest
compression_mode: pixz
decompressor_search_order: xz bzip2
update_seed: yes
diff --git a/releases/specs-qemu/riscv/stage3-lp64-musl-23.spec
b/releases/specs-qemu/riscv/rv64_lp64/stage3-lp64-musl-openrc-23.spec
similarity index 100%
copy from releases/specs-qemu/riscv/stage3-lp64-musl-23.spec
copy to releases/specs-qemu/riscv/rv64_lp64/stage3-lp64-musl-openrc-23.spec
diff --git a/releases/specs-qemu/riscv/stage3-lp64-musl-23.spec
b/releases/specs-qemu/riscv/rv64_lp64/stage3-lp64-musl-systemd-23.spec
similarity index 66%
rename from releases/specs-qemu/riscv/stage3-lp64-musl-23.spec
rename to releases/specs-qemu/riscv/rv64_lp64/stage3-lp64-musl-systemd-23.spec
index 009c3055..7890cb01 100644
--- a/releases/specs-qemu/riscv/stage3-lp64-musl-23.spec
+++ b/releases/specs-qemu/riscv/rv64_lp64/stage3-lp64-musl-systemd-23.spec
@@ -1,11 +1,11 @@
subarch: rv64_lp64_musl
target: stage3
-version_stamp: openrc-@TIMESTAMP@
+version_stamp: systemd-@TIMESTAMP@
interpreter: /usr/bin/qemu-riscv64
rel_type: 23.0-musl
-profile: default/linux/riscv/23.0/rv64/lp64/musl
+profile: default/linux/riscv/23.0/rv64/lp64/musl/systemd
snapshot_treeish: @TREEISH@
-source_subpath: 23.0-musl/stage1-rv64_lp64_musl-openrc-@TIMESTAMP@
+source_subpath: 23.0-musl/stage1-rv64_lp64_musl-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/stage1-lp64d-musl-23.spec
b/releases/specs-qemu/riscv/rv64_lp64d/stage1-lp64d-musl-openrc-23.spec
similarity index 100%
copy from releases/specs-qemu/riscv/stage1-lp64d-musl-23.spec
copy to releases/specs-qemu/riscv/rv64_lp64d/stage1-lp64d-musl-openrc-23.spec
diff --git a/releases/specs-qemu/riscv/stage1-lp64d-musl-23.spec
b/releases/specs-qemu/riscv/rv64_lp64d/stage1-lp64d-musl-systemd-23.spec
similarity index 68%
rename from releases/specs-qemu/riscv/stage1-lp64d-musl-23.spec
rename to releases/specs-qemu/riscv/rv64_lp64d/stage1-lp64d-musl-systemd-23.spec
index 4bf0cde9..6b15effc 100644
--- a/releases/specs-qemu/riscv/stage1-lp64d-musl-23.spec
+++ b/releases/specs-qemu/riscv/rv64_lp64d/stage1-lp64d-musl-systemd-23.spec
@@ -1,12 +1,12 @@
subarch: rv64_lp64d_musl
target: stage1
chost: riscv64-unknown-linux-musl
-version_stamp: openrc-@TIMESTAMP@
+version_stamp: systemd-@TIMESTAMP@
interpreter: /usr/bin/qemu-riscv64
rel_type: 23.0-musl
-profile: default/linux/riscv/23.0/rv64/lp64d/musl
+profile: default/linux/riscv/23.0/rv64/lp64d/musl/systemd
snapshot_treeish: @TREEISH@
-source_subpath: 23.0-musl/stage3-rv64_lp64d_musl-openrc-latest
+source_subpath: 23.0-musl/stage3-rv64_lp64d_musl-systemd-latest
compression_mode: pixz
decompressor_search_order: xz bzip2
update_seed: yes
diff --git a/releases/specs-qemu/riscv/stage3-lp64d-musl-23.spec
b/releases/specs-qemu/riscv/rv64_lp64d/stage3-lp64d-musl-openrc-23.spec
similarity index 100%
copy from releases/specs-qemu/riscv/stage3-lp64d-musl-23.spec
copy to releases/specs-qemu/riscv/rv64_lp64d/stage3-lp64d-musl-openrc-23.spec
diff --git a/releases/specs-qemu/riscv/stage3-lp64d-musl-23.spec
b/releases/specs-qemu/riscv/rv64_lp64d/stage3-lp64d-musl-systemd-23.spec
similarity index 66%
rename from releases/specs-qemu/riscv/stage3-lp64d-musl-23.spec
rename to releases/specs-qemu/riscv/rv64_lp64d/stage3-lp64d-musl-systemd-23.spec
index 9c145237..5d88b991 100644
--- a/releases/specs-qemu/riscv/stage3-lp64d-musl-23.spec
+++ b/releases/specs-qemu/riscv/rv64_lp64d/stage3-lp64d-musl-systemd-23.spec
@@ -1,11 +1,11 @@
subarch: rv64_lp64d_musl
target: stage3
-version_stamp: openrc-@TIMESTAMP@
+version_stamp: systemd-@TIMESTAMP@
interpreter: /usr/bin/qemu-riscv64
rel_type: 23.0-musl
-profile: default/linux/riscv/23.0/rv64/lp64d/musl
+profile: default/linux/riscv/23.0/rv64/lp64d/musl/systemd
snapshot_treeish: @TREEISH@
-source_subpath: 23.0-musl/stage1-rv64_lp64d_musl-openrc-@TIMESTAMP@
+source_subpath: 23.0-musl/stage1-rv64_lp64d_musl-systemd-@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 d12a98c4..905953b3 100644
--- a/tools/catalyst-auto-qemu-riscv.conf
+++ b/tools/catalyst-auto-qemu-riscv.conf
@@ -14,38 +14,46 @@ SETS="
lp64d_openrc_23
lp64d_systemd_23
diskimage_23
- lp64d_musl_23
+ lp64d_musl_openrc_23
+ lp64d_musl_systemd_23
lp64_openrc_23
lp64_systemd_23
- lp64_musl_23
+ lp64_musl_openrc_23
+ lp64_musl_systemd_23
multilib_openrc_23
multilib_systemd_23
ilp32d_openrc_23
ilp32d_systemd_23
- ilp32d_musl_23
+ ilp32d_musl_openrc_23
+ ilp32d_musl_systemd_23
ilp32_openrc_23
ilp32_systemd_23
- ilp32_musl_23
+ ilp32_musl_openrc_23
+ ilp32_musl_systemd_23
"
-SET_lp64d_musl_23_SPECS="stage1-lp64d-musl-23.spec stage3-lp64d-musl-23.spec"
+SET_lp64d_musl_openrc_23_SPECS="rv64_lp64d/stage1-lp64d-musl-openrc-23.spec
rv64_lp64d/stage3-lp64d-musl-openrc-23.spec"
+SET_lp64d_musl_systemd_23_SPECS="rv64_lp64d/stage1-lp64d-musl-systemd-23.spec
rv64_lp64d/stage3-lp64d-musl-systemd-23.spec"
SET_lp64d_openrc_23_SPECS="stage1-lp64d-openrc-23.spec
stage3-lp64d-openrc-23.spec"
SET_lp64d_systemd_23_SPECS="stage1-lp64d-systemd-23.spec
stage3-lp64d-systemd-23.spec"
SET_diskimage_23_SPECS="diskimage-stage1-console.spec
diskimage-stage2-console.spec diskimage-stage1-cloudinit.spec
diskimage-stage2-cloudinit.spec"
-SET_lp64_musl_23_SPECS="stage1-lp64-musl-23.spec stage3-lp64-musl-23.spec"
+SET_lp64_musl_openrc_23_SPECS="rv64_lp64/stage1-lp64-musl-openrc-23.spec
rv64_lp64/stage3-lp64-musl-openrc-23.spec"
+SET_lp64_musl_systemd_23_SPECS="rv64_lp64/stage1-lp64-musl-systemd-23.spec
rv64_lp64/stage3-lp64-musl-systemd-23.spec"
SET_lp64_openrc_23_SPECS="stage1-lp64-openrc-23.spec
stage3-lp64-openrc-23.spec"
SET_lp64_systemd_23_SPECS="stage1-lp64-systemd-23.spec
stage3-lp64-systemd-23.spec"
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_musl_openrc_23_SPECS="rv32_ilp32d/stage1-ilp32d-musl-openrc-23.spec
rv32_ilp32d/stage3-ilp32d-musl-openrc-23.spec"
+SET_ilp32d_musl_systemd_23_SPECS="rv32_ilp32d/stage1-ilp32d-musl-systemd-23.spec
rv32_ilp32d/stage3-ilp32d-musl-systemd-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"
-SET_ilp32_musl_23_SPECS="rv32_ilp32/stage1-ilp32-musl-23.spec
rv32_ilp32/stage3-ilp32-musl-23.spec"
+SET_ilp32_musl_openrc_23_SPECS="rv32_ilp32/stage1-ilp32-musl-openrc-23.spec
rv32_ilp32/stage3-ilp32-musl-openrc-23.spec"
+SET_ilp32_musl_systemd_23_SPECS="rv32_ilp32/stage1-ilp32-musl-systemd-23.spec
rv32_ilp32/stage3-ilp32-musl-systemd-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"
@@ -81,8 +89,11 @@ post_build() {
diskimage-stage2-cloudinit.spec)
upload
builds/23.0-default/di-rv64_lp64d-cloudinit-${TIMESTAMP}.qcow2*
;;
- stage3-lp64d-musl-23.spec)
+ rv64_lp64d/stage3-lp64d-musl-openrc-23.spec)
upload
builds/23.0-musl/stage3-rv64_lp64d_musl-openrc-${TIMESTAMP}*.xz*
+ ;;
+ rv64_lp64d/stage3-lp64d-musl-systemd-23.spec)
+ upload
builds/23.0-musl/stage3-rv64_lp64d_musl-systemd-${TIMESTAMP}*.xz*
upsync_binpackages
packages/23.0-musl/stage3-rv64_lp64d_musl riscv/23.0/rv64_lp64d_musl
;;
stage3-lp64-openrc-23.spec)
@@ -92,8 +103,11 @@ 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)
+ rv64_lp64/stage3-lp64-musl-openrc-23.spec)
upload
builds/23.0-musl/stage3-rv64_lp64_musl-openrc-${TIMESTAMP}*.xz*
+ ;;
+ rv64_lp64/stage3-lp64-musl-systemd-23.spec)
+ upload
builds/23.0-musl/stage3-rv64_lp64_musl-systemd-${TIMESTAMP}*.xz*
upsync_binpackages
packages/23.0-musl/stage3-rv64_lp64_musl riscv/23.0/rv64_lp64_musl
;;
stage3-multilib-openrc-23.spec)
@@ -110,8 +124,11 @@ post_build() {
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)
+ rv32_ilp32d/stage3-ilp32d-musl-openrc-23.spec)
upload
builds/23.0-musl/stage3-rv32_ilp32d_musl-openrc-${TIMESTAMP}*.xz*
+ ;;
+ rv32_ilp32d/stage3-ilp32d-musl-systemd-23.spec)
+ upload
builds/23.0-musl/stage3-rv32_ilp32d_musl-systemd-${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)
@@ -121,8 +138,11 @@ post_build() {
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)
+ rv32_ilp32/stage3-ilp32-musl-openrc-23.spec)
upload
builds/23.0-musl/stage3-rv32_ilp32_musl-openrc-${TIMESTAMP}*.xz*
+ ;;
+ rv32_ilp32/stage3-ilp32-musl-systemd-23.spec)
+ upload
builds/23.0-musl/stage3-rv32_ilp32_musl-systemd-${TIMESTAMP}*.xz*
upsync_binpackages
packages/23.0-musl/stage3-rv32_ilp32_musl riscv/23.0/rv32_ilp32_musl
;;
*)
