commit: f5690d5bbc755ea6d74e8ce2a026198f1480067d
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 13 22:55:56 2024 +0000
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Tue Feb 13 22:55:56 2024 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=f5690d5b
Disable aarch64_be split-usr systemd builds
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
releases/specs-qemu/arm64/be/stage1-systemd.spec | 13 -------------
releases/specs-qemu/arm64/be/stage3-systemd.spec | 12 ------------
tools/catalyst-auto-qemu-arm64.conf | 10 +++++-----
3 files changed, 5 insertions(+), 30 deletions(-)
diff --git a/releases/specs-qemu/arm64/be/stage1-systemd.spec
b/releases/specs-qemu/arm64/be/stage1-systemd.spec
deleted file mode 100644
index 1c175344..00000000
--- a/releases/specs-qemu/arm64/be/stage1-systemd.spec
+++ /dev/null
@@ -1,13 +0,0 @@
-subarch: aarch64_be
-version_stamp: systemd-@TIMESTAMP@
-target: stage1
-rel_type: default
-profile: default/linux/arm64/17.0/big-endian/systemd
-snapshot: @TIMESTAMP@
-source_subpath: default/stage3-aarch64_be-systemd-latest
-compression_mode: pixz
-update_seed: yes
-update_seed_command: -uDN @world
-portage_confdir: @REPO_DIR@/releases/portage/stages-qemu
-portage_prefix: releng
-interpreter: /usr/bin/qemu-aarch64_be
diff --git a/releases/specs-qemu/arm64/be/stage3-systemd.spec
b/releases/specs-qemu/arm64/be/stage3-systemd.spec
deleted file mode 100644
index 98c13e85..00000000
--- a/releases/specs-qemu/arm64/be/stage3-systemd.spec
+++ /dev/null
@@ -1,12 +0,0 @@
-subarch: aarch64_be
-version_stamp: systemd-@TIMESTAMP@
-target: stage3
-rel_type: default
-profile: default/linux/arm64/17.0/big-endian/systemd
-snapshot: @TIMESTAMP@
-source_subpath: default/stage1-aarch64_be-systemd-@TIMESTAMP@
-compression_mode: pixz
-portage_confdir: @REPO_DIR@/releases/portage/stages-qemu
-portage_prefix: releng
-interpreter: /usr/bin/qemu-aarch64_be
-binrepo_path: arm64/binpackages/17.0/aarch64_be
diff --git a/tools/catalyst-auto-qemu-arm64.conf
b/tools/catalyst-auto-qemu-arm64.conf
index 19aa9722..20654770 100644
--- a/tools/catalyst-auto-qemu-arm64.conf
+++ b/tools/catalyst-auto-qemu-arm64.conf
@@ -6,7 +6,10 @@ UPLOAD_KEY=/root/.ssh/id_ed25519
SPECS_DIR=${REPO_DIR}/releases/specs-qemu/arm64/be
SUBARCH=aarch64_be
-SETS="openrc systemd systemd_mu"
+SETS="
+ openrc
+ systemd_mu
+"
SET_openrc_SPECS="stage1-openrc.spec stage3-openrc.spec"
@@ -22,7 +25,7 @@ EMAIL_SUBJECT_PREPEND="[${SUBARCH}-auto]"
update_symlinks() {
# Symlink the latest stages3 to build from
local d f
- for d in "${BUILD_SRCDIR_BASE}/builds/default"
"${BUILD_SRCDIR_BASE}/builds/mergedusr" ; do
+ for d in "${BUILD_SRCDIR_BASE}/builds"/* ; do
mkdir -p "${d}"
pushd "${d}" >/dev/null
for f in $(ls stage3-${SUBARCH}-*xz | grep -v latest |
give_latest_from_dates) ; do
@@ -40,9 +43,6 @@ post_build() {
case ${spec} in
stage3-openrc.spec)
upload stage3-${SUBARCH}-openrc-${TIMESTAMP}*.xz*
- ;;
- stage3-systemd.spec)
- upload stage3-${SUBARCH}-systemd-${TIMESTAMP}*.xz*
upsync_binpackages
"${BUILD_SRCDIR_BASE}/packages/default/stage3-aarch64_be" arm64/17.0/aarch64_be
;;
esac
