From 7e5acd85c46e94742e7121b74834d42d774a9180 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20K=2E=20H=C3=BCttel?= <dilfridge@gentoo.org>
Date: Wed, 24 Jan 2024 21:40:19 +0100
Subject: [PATCH] Drop x86 systemd split-usr builds
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Andreas K. Hüttel <dilfridge@gentoo.org>
---
 releases/specs/x86/i486/stage1-systemd.spec | 12 ------------
 releases/specs/x86/i486/stage3-systemd.spec | 11 -----------
 releases/specs/x86/i686/stage1-systemd.spec | 12 ------------
 releases/specs/x86/i686/stage3-systemd.spec | 11 -----------
 tools/catalyst-auto-x86.conf                |  2 +-
 5 files changed, 1 insertion(+), 47 deletions(-)
 delete mode 100644 releases/specs/x86/i486/stage1-systemd.spec
 delete mode 100644 releases/specs/x86/i486/stage3-systemd.spec
 delete mode 100644 releases/specs/x86/i686/stage1-systemd.spec
 delete mode 100644 releases/specs/x86/i686/stage3-systemd.spec

diff --git a/releases/specs/x86/i486/stage1-systemd.spec b/releases/specs/x86/i486/stage1-systemd.spec
deleted file mode 100644
index f8c5f051..00000000
--- a/releases/specs/x86/i486/stage1-systemd.spec
+++ /dev/null
@@ -1,12 +0,0 @@
-subarch: i486
-target: stage1
-version_stamp: systemd-@TIMESTAMP@
-rel_type: default
-profile: default/linux/x86/17.0/systemd
-snapshot: @TIMESTAMP@
-source_subpath: default/stage3-i486-systemd-latest
-compression_mode: pixz
-update_seed: yes
-update_seed_command: --update --deep --newuse @world
-portage_confdir: @REPO_DIR@/releases/portage/stages
-portage_prefix: releng
diff --git a/releases/specs/x86/i486/stage3-systemd.spec b/releases/specs/x86/i486/stage3-systemd.spec
deleted file mode 100644
index ca8dce0c..00000000
--- a/releases/specs/x86/i486/stage3-systemd.spec
+++ /dev/null
@@ -1,11 +0,0 @@
-subarch: i486
-target: stage3
-version_stamp: systemd-@TIMESTAMP@
-rel_type: default
-profile: default/linux/x86/17.0/systemd
-snapshot: @TIMESTAMP@
-source_subpath: default/stage1-i486-systemd-@TIMESTAMP@
-compression_mode: pixz
-portage_confdir: @REPO_DIR@/releases/portage/stages
-portage_prefix: releng
-binrepo_path: x86/binpackages/17.0/i486
diff --git a/releases/specs/x86/i686/stage1-systemd.spec b/releases/specs/x86/i686/stage1-systemd.spec
deleted file mode 100644
index 86ddf4ba..00000000
--- a/releases/specs/x86/i686/stage1-systemd.spec
+++ /dev/null
@@ -1,12 +0,0 @@
-subarch: i686
-target: stage1
-version_stamp: systemd-@TIMESTAMP@
-rel_type: default
-profile: default/linux/x86/17.0/systemd
-snapshot: @TIMESTAMP@
-source_subpath: default/stage3-i686-systemd-latest
-compression_mode: pixz
-update_seed: yes
-update_seed_command: --update --deep --newuse @world
-portage_confdir: @REPO_DIR@/releases/portage/stages
-portage_prefix: releng
diff --git a/releases/specs/x86/i686/stage3-systemd.spec b/releases/specs/x86/i686/stage3-systemd.spec
deleted file mode 100644
index 3a5de590..00000000
--- a/releases/specs/x86/i686/stage3-systemd.spec
+++ /dev/null
@@ -1,11 +0,0 @@
-subarch: i686
-target: stage3
-version_stamp: systemd-@TIMESTAMP@
-rel_type: default
-profile: default/linux/x86/17.0/systemd
-snapshot: @TIMESTAMP@
-source_subpath: default/stage1-i686-systemd-@TIMESTAMP@
-compression_mode: pixz
-portage_confdir: @REPO_DIR@/releases/portage/stages
-portage_prefix: releng
-binrepo_path: x86/binpackages/17.0/i686
diff --git a/tools/catalyst-auto-x86.conf b/tools/catalyst-auto-x86.conf
index fa9f9b73..c30fd4f4 100644
--- a/tools/catalyst-auto-x86.conf
+++ b/tools/catalyst-auto-x86.conf
@@ -38,7 +38,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,hardened,musl,mergedusr} ; do
+	for d in ${BUILD_SRCDIR_BASE}/builds/* ; do
 		mkdir -p "${d}"
 		pushd "${d}" >/dev/null || exit
 		shopt -s extglob