[gentoo-commits] proj/releng:master commit in: tools/, releases/specs/x86/i686/

[gentoo-commits] proj/releng:master commit in: tools/, releases/specs/x86/i686/

[Andreas K. Hüttel]

commit:     0f125915c6f96f8c10f1fe7ed6e625e22c8e08ee
Author:     Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Fri Nov 25 14:37:27 2022 +0000
Commit:     Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Fri Nov 25 14:37:27 2022 +0000
URL:        https://gitweb.gentoo.org/proj/releng.git/commit/?id=0f125915

Move x86 merged-usr builds to separate build types

Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>

 releases/specs/x86/i686/stage1-systemd-mu.spec | 4 ++--
 releases/specs/x86/i686/stage3-systemd-mu.spec | 4 ++--
 tools/catalyst-auto-x86.conf                   | 7 ++++++-
 3 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/releases/specs/x86/i686/stage1-systemd-mu.spec b/releases/specs/x86/i686/stage1-systemd-mu.spec
index d7bb1aab..8c0e664f 100644
--- a/releases/specs/x86/i686/stage1-systemd-mu.spec
+++ b/releases/specs/x86/i686/stage1-systemd-mu.spec
@@ -1,10 +1,10 @@
 subarch: i686
 target: stage1
 version_stamp: systemd-mergedusr-@TIMESTAMP@
-rel_type: default
+rel_type: mergedusr
 profile: default/linux/x86/17.0/systemd/merged-usr
 snapshot: @TIMESTAMP@
-source_subpath: default/stage3-i686-systemd-mergedusr-latest
+source_subpath: mergedusr/stage3-i686-systemd-mergedusr-latest
 compression_mode: pixz
 update_seed: no
 update_seed_command: --update --deep --newuse @world

diff --git a/releases/specs/x86/i686/stage3-systemd-mu.spec b/releases/specs/x86/i686/stage3-systemd-mu.spec
index 22a40f2c..d72fdc48 100644
--- a/releases/specs/x86/i686/stage3-systemd-mu.spec
+++ b/releases/specs/x86/i686/stage3-systemd-mu.spec
@@ -1,10 +1,10 @@
 subarch: i686
 target: stage3
 version_stamp: systemd-mergedusr-@TIMESTAMP@
-rel_type: default
+rel_type: mergedusr
 profile: default/linux/x86/17.0/systemd/merged-usr
 snapshot: @TIMESTAMP@
-source_subpath: default/stage1-i686-systemd-mergedusr-@TIMESTAMP@
+source_subpath: mergedusr/stage1-i686-systemd-mergedusr-@TIMESTAMP@
 compression_mode: pixz
 portage_confdir: @REPO_DIR@/releases/portage/stages
 portage_prefix: releng

diff --git a/tools/catalyst-auto-x86.conf b/tools/catalyst-auto-x86.conf
index dddf0496..f247b1bd 100644
--- a/tools/catalyst-auto-x86.conf
+++ b/tools/catalyst-auto-x86.conf
@@ -39,7 +39,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} ; do
+	for d in ${BUILD_SRCDIR_BASE}/builds/{default,hardened,musl,mergedusr} ; do
 		mkdir -p "${d}"
 		pushd "${d}" >/dev/null || exit
 		shopt -s extglob
@@ -80,6 +80,11 @@ post_build() {
 	i686/stage3-systemd.spec)
 		upload stage3-i686-systemd-${TIMESTAMP}.tar.xz*
 		;;
+	esac
+	popd >/dev/null || exit
+
+	pushd ${BUILD_SRCDIR_BASE}/builds/mergedusr >/dev/null || exit
+	case ${spec} in
 	i686/stage3-systemd-mu.spec)
 		upload stage3-i686-systemd-mergedusr-${TIMESTAMP}.tar.xz*
 		;;