commit: cd55ba6a335dc423ddf032c91bb5b857a6068c6c Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org> AuthorDate: Wed Nov 23 22:53:41 2022 +0000 Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org> CommitDate: Wed Nov 23 22:53:41 2022 +0000 URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=cd55ba6a
Move m68k merged-usr builds to separate build types Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org> releases/specs-qemu/m68k/stage1-systemd-mu.spec | 4 ++-- releases/specs-qemu/m68k/stage3-systemd-mu.spec | 4 ++-- tools/catalyst-auto-qemu-m68k.conf | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/releases/specs-qemu/m68k/stage1-systemd-mu.spec b/releases/specs-qemu/m68k/stage1-systemd-mu.spec index ae5ec941..dae9c234 100644 --- a/releases/specs-qemu/m68k/stage1-systemd-mu.spec +++ b/releases/specs-qemu/m68k/stage1-systemd-mu.spec @@ -1,10 +1,10 @@ subarch: m68k version_stamp: systemd-mergedusr-@TIMESTAMP@ target: stage1 -rel_type: default +rel_type: mergedusr profile: default/linux/m68k/17.0/systemd/merged-usr snapshot: @TIMESTAMP@ -source_subpath: default/stage3-m68k-systemd-mergedusr-latest +source_subpath: mergedusr/stage3-m68k-systemd-mergedusr-latest compression_mode: pixz update_seed: no update_seed_command: -uDN @world diff --git a/releases/specs-qemu/m68k/stage3-systemd-mu.spec b/releases/specs-qemu/m68k/stage3-systemd-mu.spec index 527b2056..aef1ca26 100644 --- a/releases/specs-qemu/m68k/stage3-systemd-mu.spec +++ b/releases/specs-qemu/m68k/stage3-systemd-mu.spec @@ -1,10 +1,10 @@ subarch: m68k version_stamp: systemd-mergedusr-@TIMESTAMP@ target: stage3 -rel_type: default +rel_type: mergedusr profile: default/linux/m68k/17.0/systemd/merged-usr snapshot: @TIMESTAMP@ -source_subpath: default/stage1-m68k-systemd-mergedusr-@TIMESTAMP@ +source_subpath: mergedusr/stage1-m68k-systemd-mergedusr-@TIMESTAMP@ compression_mode: pixz portage_confdir: @REPO_DIR@/releases/portage/stages-qemu portage_prefix: releng diff --git a/tools/catalyst-auto-qemu-m68k.conf b/tools/catalyst-auto-qemu-m68k.conf index 96158c71..868a27f6 100644 --- a/tools/catalyst-auto-qemu-m68k.conf +++ b/tools/catalyst-auto-qemu-m68k.conf @@ -23,7 +23,7 @@ SET_systemd_mu_SPECS="stage1-systemd-mu.spec stage3-systemd-mu.spec" update_symlinks() { # Symlink the latest stages3 to build from local d f - for d in "${BUILD_SRCDIR_BASE}/builds/default" ; do + for d in "${BUILD_SRCDIR_BASE}/builds/default" "${BUILD_SRCDIR_BASE}/builds/mergedusr" ; do mkdir -p "${d}" pushd "${d}" >/dev/null for f in $(ls stage3*xz | grep -v latest | give_latest_from_dates) ; do @@ -49,7 +49,7 @@ post_build() { popd >/dev/null ;; stage3-systemd-mu.spec) - pushd "${BUILD_SRCDIR_BASE}/builds/default" >/dev/null + pushd "${BUILD_SRCDIR_BASE}/builds/mergedusr" >/dev/null upload stage3-m68k-systemd-mergedusr-${TIMESTAMP}*.xz* popd >/dev/null ;;