commit: 1e6ab71f009dcf48327a719abb78a99a43b1c2ac
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 14 22:04:43 2026 +0000
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sat Feb 14 22:04:43 2026 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=1e6ab71f
First amd64 musl/systemd experiments
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
.../amd64/musl/{stage1-23.spec => stage1-openrc-23.spec} | 0
.../amd64/musl/{stage1-23.spec => stage1-systemd-23.spec} | 6 +++---
.../amd64/musl/{stage3-23.spec => stage3-openrc-23.spec} | 0
.../amd64/musl/{stage3-23.spec => stage3-systemd-23.spec} | 6 +++---
tools/catalyst-auto-amd64.conf | 12 +++++++++---
5 files changed, 15 insertions(+), 9 deletions(-)
diff --git a/releases/specs/amd64/musl/stage1-23.spec
b/releases/specs/amd64/musl/stage1-openrc-23.spec
similarity index 100%
copy from releases/specs/amd64/musl/stage1-23.spec
copy to releases/specs/amd64/musl/stage1-openrc-23.spec
diff --git a/releases/specs/amd64/musl/stage1-23.spec
b/releases/specs/amd64/musl/stage1-systemd-23.spec
similarity index 65%
rename from releases/specs/amd64/musl/stage1-23.spec
rename to releases/specs/amd64/musl/stage1-systemd-23.spec
index f82899ad..ea5217ea 100644
--- a/releases/specs/amd64/musl/stage1-23.spec
+++ b/releases/specs/amd64/musl/stage1-systemd-23.spec
@@ -1,10 +1,10 @@
subarch: amd64
target: stage1
-version_stamp: musl-openrc-@TIMESTAMP@
+version_stamp: musl-systemd-@TIMESTAMP@
rel_type: 23.0-musl
-profile: default/linux/amd64/23.0/musl
+profile: default/linux/amd64/23.0/musl/systemd
snapshot_treeish: @TREEISH@
-source_subpath: 23.0-musl/stage3-amd64-musl-openrc-latest
+source_subpath: 23.0-musl/stage3-amd64-musl-systemd-latest
chost: x86_64-pc-linux-musl
portage_confdir: @REPO_DIR@/releases/portage/stages
portage_prefix: releng
diff --git a/releases/specs/amd64/musl/stage3-23.spec
b/releases/specs/amd64/musl/stage3-openrc-23.spec
similarity index 100%
copy from releases/specs/amd64/musl/stage3-23.spec
copy to releases/specs/amd64/musl/stage3-openrc-23.spec
diff --git a/releases/specs/amd64/musl/stage3-23.spec
b/releases/specs/amd64/musl/stage3-systemd-23.spec
similarity index 59%
rename from releases/specs/amd64/musl/stage3-23.spec
rename to releases/specs/amd64/musl/stage3-systemd-23.spec
index aa74bbcd..d6818535 100644
--- a/releases/specs/amd64/musl/stage3-23.spec
+++ b/releases/specs/amd64/musl/stage3-systemd-23.spec
@@ -1,10 +1,10 @@
subarch: amd64
target: stage3
-version_stamp: musl-openrc-@TIMESTAMP@
+version_stamp: musl-systemd-@TIMESTAMP@
rel_type: 23.0-musl
-profile: default/linux/amd64/23.0/musl
+profile: default/linux/amd64/23.0/musl/systemd
snapshot_treeish: @TREEISH@
-source_subpath: 23.0-musl/stage1-amd64-musl-openrc-@TIMESTAMP@
+source_subpath: 23.0-musl/stage1-amd64-musl-systemd-@TIMESTAMP@
portage_confdir: @REPO_DIR@/releases/portage/stages
portage_prefix: releng
compression_mode: pixz
diff --git a/tools/catalyst-auto-amd64.conf b/tools/catalyst-auto-amd64.conf
index f15200dc..61620c99 100644
--- a/tools/catalyst-auto-amd64.conf
+++ b/tools/catalyst-auto-amd64.conf
@@ -23,7 +23,8 @@ SETS="
hardened_systemd_23
hardened_selinux_openrc_23
hardened_selinux_systemd_23
- musl_23
+ musl_openrc_23
+ musl_systemd_23
musl_hardened_23
musl_llvm_23
x32_openrc_23
@@ -60,7 +61,9 @@ SET_llvm_openrc_23_SPECS="llvm/stage1-openrc-23.spec
llvm/stage3-openrc-23.spec"
SET_llvm_systemd_23_SPECS="llvm/stage1-systemd-23.spec
llvm/stage3-systemd-23.spec"
-SET_musl_23_SPECS="musl/stage1-23.spec musl/stage3-23.spec"
+SET_musl_openrc_23_SPECS="musl/stage1-openrc-23.spec
musl/stage3-openrc-23.spec"
+
+SET_musl_systemd_23_SPECS="musl/stage1-systemd-23.spec
musl/stage3-systemd-23.spec"
SET_musl_llvm_23_SPECS="musl-llvm/stage1-23.spec musl-llvm/stage3-23.spec"
@@ -202,8 +205,11 @@ post_build() {
pushd "${BUILD_SRCDIR_BASE}"/builds/23.0-musl >/dev/null || exit
case ${spec} in
- musl/stage3-23.spec)
+ musl/stage3-openrc-23.spec)
upload stage3-amd64-musl-openrc-${TIMESTAMP}.tar.xz*
+ ;;
+ musl/stage3-systemd-23.spec)
+ upload stage3-amd64-musl-systemd-${TIMESTAMP}.tar.xz*
upsync_binpackages
"${BUILD_SRCDIR_BASE}/packages/23.0-musl/stage3-amd64" amd64/23.0/x86-64_musl
;;
esac
