commit: 759b2ae92949135bca28eb3132eb3060b9c0f708
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 15 22:34:40 2026 +0000
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sun Mar 15 22:42:52 2026 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=759b2ae9
amd64: enable musl/systemd builds
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
.../{stage1-23.spec => stage1-openrc-23.spec} | 0
.../{stage1-23.spec => stage1-systemd-23.spec} | 6 ++---
.../{stage3-23.spec => stage3-openrc-23.spec} | 0
.../{stage3-23.spec => stage3-systemd-23.spec} | 6 ++---
.../{stage1-23.spec => stage1-openrc-23.spec} | 0
.../{stage1-23.spec => stage1-systemd-23.spec} | 6 ++---
.../{stage3-23.spec => stage3-openrc-23.spec} | 0
.../{stage3-23.spec => stage3-systemd-23.spec} | 6 ++---
tools/catalyst-auto-amd64.conf | 28 ++++++++++++----------
9 files changed, 28 insertions(+), 24 deletions(-)
diff --git a/releases/specs/amd64/musl-hardened/stage1-23.spec
b/releases/specs/amd64/musl-hardened/stage1-openrc-23.spec
similarity index 100%
copy from releases/specs/amd64/musl-hardened/stage1-23.spec
copy to releases/specs/amd64/musl-hardened/stage1-openrc-23.spec
diff --git a/releases/specs/amd64/musl-hardened/stage1-23.spec
b/releases/specs/amd64/musl-hardened/stage1-systemd-23.spec
similarity index 60%
rename from releases/specs/amd64/musl-hardened/stage1-23.spec
rename to releases/specs/amd64/musl-hardened/stage1-systemd-23.spec
index c737b738..861caf8c 100644
--- a/releases/specs/amd64/musl-hardened/stage1-23.spec
+++ b/releases/specs/amd64/musl-hardened/stage1-systemd-23.spec
@@ -1,10 +1,10 @@
subarch: amd64
target: stage1
-version_stamp: musl-hardened-openrc-@TIMESTAMP@
+version_stamp: musl-hardened-systemd-@TIMESTAMP@
rel_type: 23.0-musl-hardened
-profile: default/linux/amd64/23.0/musl/hardened
+profile: default/linux/amd64/23.0/musl/hardened/systemd
snapshot_treeish: @TREEISH@
-source_subpath: 23.0-musl-hardened/stage3-amd64-musl-hardened-openrc-latest
+source_subpath: 23.0-musl-hardened/stage3-amd64-musl-hardened-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-hardened/stage3-23.spec
b/releases/specs/amd64/musl-hardened/stage3-openrc-23.spec
similarity index 100%
copy from releases/specs/amd64/musl-hardened/stage3-23.spec
copy to releases/specs/amd64/musl-hardened/stage3-openrc-23.spec
diff --git a/releases/specs/amd64/musl-hardened/stage3-23.spec
b/releases/specs/amd64/musl-hardened/stage3-systemd-23.spec
similarity index 56%
rename from releases/specs/amd64/musl-hardened/stage3-23.spec
rename to releases/specs/amd64/musl-hardened/stage3-systemd-23.spec
index d170b1cd..7324c401 100644
--- a/releases/specs/amd64/musl-hardened/stage3-23.spec
+++ b/releases/specs/amd64/musl-hardened/stage3-systemd-23.spec
@@ -1,10 +1,10 @@
subarch: amd64
target: stage3
-version_stamp: musl-hardened-openrc-@TIMESTAMP@
+version_stamp: musl-hardened-systemd-@TIMESTAMP@
rel_type: 23.0-musl-hardened
-profile: default/linux/amd64/23.0/musl/hardened
+profile: default/linux/amd64/23.0/musl/hardened/systemd
snapshot_treeish: @TREEISH@
-source_subpath:
23.0-musl-hardened/stage1-amd64-musl-hardened-openrc-@TIMESTAMP@
+source_subpath:
23.0-musl-hardened/stage1-amd64-musl-hardened-systemd-@TIMESTAMP@
portage_confdir: @REPO_DIR@/releases/portage/stages
portage_prefix: releng
compression_mode: pixz
diff --git a/releases/specs/amd64/musl-llvm/stage1-23.spec
b/releases/specs/amd64/musl-llvm/stage1-openrc-23.spec
similarity index 100%
copy from releases/specs/amd64/musl-llvm/stage1-23.spec
copy to releases/specs/amd64/musl-llvm/stage1-openrc-23.spec
diff --git a/releases/specs/amd64/musl-llvm/stage1-23.spec
b/releases/specs/amd64/musl-llvm/stage1-systemd-23.spec
similarity index 62%
rename from releases/specs/amd64/musl-llvm/stage1-23.spec
rename to releases/specs/amd64/musl-llvm/stage1-systemd-23.spec
index 3823ca53..0cf6df66 100644
--- a/releases/specs/amd64/musl-llvm/stage1-23.spec
+++ b/releases/specs/amd64/musl-llvm/stage1-systemd-23.spec
@@ -1,10 +1,10 @@
subarch: amd64
target: stage1
-version_stamp: musl-llvm-openrc-@TIMESTAMP@
+version_stamp: musl-llvm-systemd-@TIMESTAMP@
rel_type: 23.0-musl-llvm
-profile: default/linux/amd64/23.0/musl/llvm
+profile: default/linux/amd64/23.0/musl/llvm/systemd
snapshot_treeish: @TREEISH@
-source_subpath: 23.0-musl-llvm/stage3-amd64-musl-llvm-openrc-latest
+source_subpath: 23.0-musl-llvm/stage3-amd64-musl-llvm-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-llvm/stage3-23.spec
b/releases/specs/amd64/musl-llvm/stage3-openrc-23.spec
similarity index 100%
copy from releases/specs/amd64/musl-llvm/stage3-23.spec
copy to releases/specs/amd64/musl-llvm/stage3-openrc-23.spec
diff --git a/releases/specs/amd64/musl-llvm/stage3-23.spec
b/releases/specs/amd64/musl-llvm/stage3-systemd-23.spec
similarity index 57%
rename from releases/specs/amd64/musl-llvm/stage3-23.spec
rename to releases/specs/amd64/musl-llvm/stage3-systemd-23.spec
index 81a4b634..35185ef8 100644
--- a/releases/specs/amd64/musl-llvm/stage3-23.spec
+++ b/releases/specs/amd64/musl-llvm/stage3-systemd-23.spec
@@ -1,10 +1,10 @@
subarch: amd64
target: stage3
-version_stamp: musl-llvm-openrc-@TIMESTAMP@
+version_stamp: musl-llvm-systemd-@TIMESTAMP@
rel_type: 23.0-musl-llvm
-profile: default/linux/amd64/23.0/musl/llvm
+profile: default/linux/amd64/23.0/musl/llvm/systemd
snapshot_treeish: @TREEISH@
-source_subpath: 23.0-musl-llvm/stage1-amd64-musl-llvm-openrc-@TIMESTAMP@
+source_subpath: 23.0-musl-llvm/stage1-amd64-musl-llvm-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 11964a89..185bc449 100644
--- a/tools/catalyst-auto-amd64.conf
+++ b/tools/catalyst-auto-amd64.conf
@@ -25,8 +25,10 @@ SETS="
hardened_selinux_systemd_23
musl_openrc_23
musl_systemd_23
- musl_hardened_23
- musl_llvm_23
+ musl_hardened_openrc_23
+ musl_hardened_systemd_23
+ musl_llvm_openrc_23
+ musl_llvm_systemd_23
x32_openrc_23
x32_systemd_23
"
@@ -44,33 +46,29 @@ SET_systemd_23_SPECS="stage1-systemd-23.spec
stage3-systemd-23.spec stage3d-syst
SET_systemd_23_OPTIONAL_SPECS="stage4w-systemd-23.spec"
SET_hardened_openrc_23_SPECS="hardened/stage1-openrc-23.spec
hardened/stage3-openrc-23.spec"
-
SET_hardened_systemd_23_SPECS="hardened/stage1-systemd-23.spec
hardened/stage3-systemd-23.spec"
SET_hardened_selinux_openrc_23_SPECS="hardened-selinux/stage1-openrc-23.spec
hardened-selinux/stage3-openrc-23.spec"
-
SET_hardened_selinux_systemd_23_SPECS="hardened-selinux/stage1-systemd-23.spec
hardened-selinux/stage3-systemd-23.spec"
SET_nomultilib_openrc_23_SPECS="nomultilib/stage1-openrc-23.spec
nomultilib/stage3-openrc-23.spec"
-
SET_nomultilib_systemd_23_SPECS="nomultilib/stage1-systemd-23.spec
nomultilib/stage3-systemd-23.spec"
SET_diskimage_23_SPECS="diskimage-stage1-console.spec
diskimage-stage2-console.spec diskimage-stage1-cloudinit.spec
diskimage-stage2-cloudinit.spec"
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_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"
+SET_musl_llvm_openrc_23_SPECS="musl-llvm/stage1-openrc-23.spec
musl-llvm/stage3-openrc-23.spec"
+SET_musl_llvm_systemd_23_SPECS="musl-llvm/stage1-systemd-23.spec
musl-llvm/stage3-systemd-23.spec"
-SET_musl_hardened_23_SPECS="musl-hardened/stage1-23.spec
musl-hardened/stage3-23.spec"
+SET_musl_hardened_openrc_23_SPECS="musl-hardened/stage1-openrc-23.spec
musl-hardened/stage3-openrc-23.spec"
+SET_musl_hardened_systemd_23_SPECS="musl-hardened/stage1-systemd-23.spec
musl-hardened/stage3-systemd-23.spec"
SET_x32_openrc_23_SPECS="x32/stage1-openrc-23.spec x32/stage3-openrc-23.spec"
-
SET_x32_systemd_23_SPECS="x32/stage1-systemd-23.spec
x32/stage3-systemd-23.spec"
@@ -220,8 +218,11 @@ post_build() {
pushd "${BUILD_SRCDIR_BASE}"/builds/23.0-musl-llvm >/dev/null || exit
case ${spec} in
- musl-llvm/stage3-23.spec)
+ musl-llvm/stage3-openrc-23.spec)
upload stage3-amd64-musl-llvm-openrc-${TIMESTAMP}.tar.xz*
+ ;;
+ musl-llvm/stage3-systemd-23.spec)
+ upload stage3-amd64-musl-llvm-systemd-${TIMESTAMP}.tar.xz*
upsync_binpackages
"${BUILD_SRCDIR_BASE}/packages/23.0-musl-llvm/stage3-amd64"
amd64/23.0/x86-64_musl_llvm
;;
esac
@@ -229,8 +230,11 @@ post_build() {
pushd "${BUILD_SRCDIR_BASE}"/builds/23.0-musl-hardened >/dev/null ||
exit
case ${spec} in
- musl-hardened/stage3-23.spec)
+ musl-hardened/stage3-openrc-23.spec)
upload stage3-amd64-musl-hardened-openrc-${TIMESTAMP}.tar.xz*
+ ;;
+ musl-hardened/stage3-systemd-23.spec)
+ upload stage3-amd64-musl-hardened-systemd-${TIMESTAMP}.tar.xz*
upsync_binpackages
"${BUILD_SRCDIR_BASE}/packages/23.0-musl-hardened/stage3-amd64"
amd64/23.0/x86-64_musl_hardened
;;
esac
