commit: 6255fc3365c4591b0962ccda8e296892acc4dbf4
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 14 22:19:30 2023 +0000
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Thu Dec 14 22:26:55 2023 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=6255fc33
Stop building and uploading amd64 systemd split-usr stages
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
tools/catalyst-auto-amd64.conf | 32 +-------------------------------
1 file changed, 1 insertion(+), 31 deletions(-)
diff --git a/tools/catalyst-auto-amd64.conf b/tools/catalyst-auto-amd64.conf
index 4fbce5bf..f1da137f 100644
--- a/tools/catalyst-auto-amd64.conf
+++ b/tools/catalyst-auto-amd64.conf
@@ -11,14 +11,11 @@ SPECS_DIR=${REPO_DIR}/releases/specs/amd64
SETS="
openrc
- systemd
systemd_mu
livegui
nomultilib_openrc
- nomultilib_systemd
nomultilib_systemd_mu
llvm_openrc
- llvm_systemd
llvm_systemd_mu
hardened_openrc
hardened_nomultilib_openrc
@@ -28,7 +25,6 @@ SETS="
musl_hardened
musl_llvm
x32_openrc
- x32_systemd
x32_systemd_mu
"
@@ -37,9 +33,6 @@ SET_openrc_OPTIONAL_SPECS="stage3d-openrc.spec
installcd-stage1.spec installcd-s
SET_livegui_OPTIONAL_SPECS="livegui/livegui-stage1.spec
livegui/livegui-stage2.spec"
-SET_systemd_SPECS="stage1-systemd.spec stage3-systemd.spec"
-SET_systemd_OPTIONAL_SPECS="stage3d-systemd.spec"
-
SET_systemd_mu_SPECS="stage1-systemd-mu.spec stage3-systemd-mu.spec"
SET_systemd_mu_OPTIONAL_SPECS="stage3d-systemd-mu.spec"
@@ -54,14 +47,10 @@
SET_hardened_nomultilib_openrc_SPECS="hardened-nomultilib/stage1-openrc.spec har
SET_nomultilib_openrc_SPECS="nomultilib/stage1-openrc.spec
nomultilib/stage3-openrc.spec"
-SET_nomultilib_systemd_SPECS="nomultilib/stage1-systemd.spec
nomultilib/stage3-systemd.spec"
-
SET_nomultilib_systemd_mu_SPECS="nomultilib/stage1-systemd-mu.spec
nomultilib/stage3-systemd-mu.spec"
SET_llvm_openrc_SPECS="clang/stage1-openrc.spec clang/stage3-openrc.spec"
-SET_llvm_systemd_SPECS="clang/stage1-systemd.spec clang/stage3-systemd.spec"
-
SET_llvm_systemd_mu_SPECS="clang/stage1-systemd-mu.spec
clang/stage3-systemd-mu.spec"
SET_musl_SPECS="musl/stage1.spec musl/stage3.spec"
@@ -72,8 +61,6 @@ SET_musl_hardened_SPECS="musl-hardened/stage1.spec
musl-hardened/stage3.spec"
SET_x32_openrc_SPECS="x32/stage1-openrc.spec x32/stage3-openrc.spec"
-SET_x32_systemd_SPECS="x32/stage1-systemd.spec x32/stage3-systemd.spec"
-
SET_x32_systemd_mu_SPECS="x32/stage1-systemd-mu.spec
x32/stage3-systemd-mu.spec"
KCONFIG_DIR=${REPO_DIR}/releases/kconfig/amd64
@@ -82,7 +69,7 @@ EXTENSIONS="@(.tar.xz|.tar.bz2|.tar.gz|.tar|.sfs)"
update_symlinks() {
# Symlink the latest stages3 to build from
- for d in
${BUILD_SRCDIR_BASE}/builds/{default,clang,hardened,llvm-mergedusr,mergedusr,musl,musl-clang,musl-hardened}
; do
+ for d in "${BUILD_SRCDIR_BASE}/builds"/* ; do
mkdir -p "${d}"
pushd "${d}" >/dev/null || exit
shopt -s extglob
@@ -110,33 +97,19 @@ post_build() {
case ${spec} in
stage3-openrc.spec)
upload stage3-amd64-openrc-${TIMESTAMP}.tar.xz*
- ;;
- stage3-systemd.spec)
- upload stage3-amd64-systemd-${TIMESTAMP}.tar.xz*
# do not upsync_binpackages, done by extra builder
;;
stage3d-openrc.spec)
upload stage3-amd64-desktop-openrc-${TIMESTAMP}.tar.xz*
;;
- stage3d-systemd.spec)
- upload stage3-amd64-desktop-systemd-${TIMESTAMP}.tar.xz*
- # do not upsync_binpackages, done by extra builder
- ;;
installcd-stage2-minimal.spec)
upload install-amd64-minimal-${TIMESTAMP}.iso*
;;
nomultilib/stage3-openrc.spec)
upload stage3-amd64-nomultilib-openrc-${TIMESTAMP}.tar.xz*
;;
- nomultilib/stage3-systemd.spec)
- upload stage3-amd64-nomultilib-systemd-${TIMESTAMP}.tar.xz*
- # do not upsync_binpackages, done by extra builder
- ;;
x32/stage3-openrc.spec)
upload stage3-x32-openrc-${TIMESTAMP}.tar.xz*
- ;;
- x32/stage3-systemd.spec)
- upload stage3-x32-systemd-${TIMESTAMP}.tar.xz*
upsync_binpackages
"${BUILD_SRCDIR_BASE}/packages/default/stage3-x32" amd64/17.0/x32
;;
livegui/livegui-stage2.spec)
@@ -166,9 +139,6 @@ post_build() {
case ${spec} in
clang/stage3-openrc.spec)
upload stage3-amd64-llvm-openrc-${TIMESTAMP}.tar.xz*
- ;;
- clang/stage3-systemd.spec)
- upload stage3-amd64-llvm-systemd-${TIMESTAMP}.tar.xz*
upsync_binpackages
"${BUILD_SRCDIR_BASE}/packages/clang/stage3-amd64" amd64/17.1/x86-64_llvm
;;
esac
