From d9ef6099b47d8f00aaf128b314616d5117bdd550 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20K=2E=20H=C3=BCttel?= Date: Thu, 24 Nov 2022 14:37:08 +0100 Subject: [PATCH] Move ppc merged-usr builds to separate build types MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Andreas K. Hüttel --- releases/specs/ppc/ppc32/stage1-systemd-mu.spec | 4 ++-- releases/specs/ppc/ppc32/stage3-systemd-mu.spec | 4 ++-- releases/specs/ppc/ppc64/stage1-systemd-mu.spec | 4 ++-- releases/specs/ppc/ppc64/stage3-systemd-mu.spec | 4 ++-- releases/specs/ppc/ppc64le/stage1-systemd-mu.spec | 4 ++-- releases/specs/ppc/ppc64le/stage3-systemd-mu.spec | 4 ++-- tools/catalyst-auto-ppc.conf | 6 +++--- tools/catalyst-auto-ppc64le.conf | 4 ++-- 8 files changed, 17 insertions(+), 17 deletions(-) diff --git a/releases/specs/ppc/ppc32/stage1-systemd-mu.spec b/releases/specs/ppc/ppc32/stage1-systemd-mu.spec index 79c9a23a..8de578b6 100644 --- a/releases/specs/ppc/ppc32/stage1-systemd-mu.spec +++ b/releases/specs/ppc/ppc32/stage1-systemd-mu.spec @@ -1,10 +1,10 @@ subarch: ppc target: stage1 version_stamp: systemd-mergedusr-@TIMESTAMP@ -rel_type: default +rel_type: mergedusr profile: default/linux/ppc/17.0/systemd/merged-usr snapshot: @TIMESTAMP@ -source_subpath: default/stage3-ppc-systemd-mergedusr-latest +source_subpath: mergedusr/stage3-ppc-systemd-mergedusr-latest compression_mode: pixz update_seed: no update_seed_command: --update --deep --newuse @world --jobs 8 --load-average 12 diff --git a/releases/specs/ppc/ppc32/stage3-systemd-mu.spec b/releases/specs/ppc/ppc32/stage3-systemd-mu.spec index 7435b726..b975bb2a 100644 --- a/releases/specs/ppc/ppc32/stage3-systemd-mu.spec +++ b/releases/specs/ppc/ppc32/stage3-systemd-mu.spec @@ -1,10 +1,10 @@ subarch: ppc target: stage3 version_stamp: systemd-mergedusr-@TIMESTAMP@ -rel_type: default +rel_type: mergedusr profile: default/linux/ppc/17.0/systemd/merged-usr snapshot: @TIMESTAMP@ -source_subpath: default/stage1-ppc-systemd-mergedusr-@TIMESTAMP@ +source_subpath: mergedusr/stage1-ppc-systemd-mergedusr-@TIMESTAMP@ compression_mode: pixz portage_confdir: @REPO_DIR@/releases/portage/stages portage_prefix: releng diff --git a/releases/specs/ppc/ppc64/stage1-systemd-mu.spec b/releases/specs/ppc/ppc64/stage1-systemd-mu.spec index e84e07d9..cb4efc73 100644 --- a/releases/specs/ppc/ppc64/stage1-systemd-mu.spec +++ b/releases/specs/ppc/ppc64/stage1-systemd-mu.spec @@ -1,10 +1,10 @@ subarch: ppc64 target: stage1 version_stamp: systemd-mergedusr-@TIMESTAMP@ -rel_type: default +rel_type: mergedusr profile: default/linux/ppc64/17.0/systemd/merged-usr snapshot: @TIMESTAMP@ -source_subpath: default/stage3-ppc64-systemd-mergedusr-latest +source_subpath: mergedusr/stage3-ppc64-systemd-mergedusr-latest compression_mode: pixz update_seed: no update_seed_command: --update --deep --newuse @world --jobs 8 --load-average 12 diff --git a/releases/specs/ppc/ppc64/stage3-systemd-mu.spec b/releases/specs/ppc/ppc64/stage3-systemd-mu.spec index fb62dd12..1bb99544 100644 --- a/releases/specs/ppc/ppc64/stage3-systemd-mu.spec +++ b/releases/specs/ppc/ppc64/stage3-systemd-mu.spec @@ -1,10 +1,10 @@ subarch: ppc64 target: stage3 version_stamp: systemd-mergedusr-@TIMESTAMP@ -rel_type: default +rel_type: mergedusr profile: default/linux/ppc64/17.0/systemd/merged-usr snapshot: @TIMESTAMP@ -source_subpath: default/stage1-ppc64-systemd-mergedusr-@TIMESTAMP@ +source_subpath: mergedusr/stage1-ppc64-systemd-mergedusr-@TIMESTAMP@ compression_mode: pixz portage_confdir: @REPO_DIR@/releases/portage/stages portage_prefix: releng diff --git a/releases/specs/ppc/ppc64le/stage1-systemd-mu.spec b/releases/specs/ppc/ppc64le/stage1-systemd-mu.spec index 7d5042c3..78f23e56 100644 --- a/releases/specs/ppc/ppc64le/stage1-systemd-mu.spec +++ b/releases/specs/ppc/ppc64le/stage1-systemd-mu.spec @@ -1,10 +1,10 @@ subarch: ppc64le target: stage1 version_stamp: systemd-mergedusr-@TIMESTAMP@ -rel_type: default +rel_type: mergedusr profile: default/linux/ppc64le/17.0/systemd/merged-usr snapshot: @TIMESTAMP@ -source_subpath: default/stage3-ppc64le-systemd-mergedusr-latest +source_subpath: mergedusr/stage3-ppc64le-systemd-mergedusr-latest compression_mode: pixz update_seed: no update_seed_command: --update --deep --newuse @world --jobs 8 --load-average 12 diff --git a/releases/specs/ppc/ppc64le/stage3-systemd-mu.spec b/releases/specs/ppc/ppc64le/stage3-systemd-mu.spec index 9b531048..7fe9eeef 100644 --- a/releases/specs/ppc/ppc64le/stage3-systemd-mu.spec +++ b/releases/specs/ppc/ppc64le/stage3-systemd-mu.spec @@ -1,10 +1,10 @@ subarch: ppc64le target: stage3 version_stamp: systemd-mergedusr-@TIMESTAMP@ -rel_type: default +rel_type: mergedusr profile: default/linux/ppc64le/17.0/systemd/merged-usr snapshot: @TIMESTAMP@ -source_subpath: default/stage1-ppc64le-systemd-mergedusr-@TIMESTAMP@ +source_subpath: mergedusr/stage1-ppc64le-systemd-mergedusr-@TIMESTAMP@ compression_mode: pixz portage_confdir: @REPO_DIR@/releases/portage/stages portage_prefix: releng diff --git a/tools/catalyst-auto-ppc.conf b/tools/catalyst-auto-ppc.conf index d68333a6..727e7eb7 100644 --- a/tools/catalyst-auto-ppc.conf +++ b/tools/catalyst-auto-ppc.conf @@ -25,7 +25,7 @@ EMAIL_SUBJECT_PREPEND="[ppc-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/musl-hardened" ; do + for d in "${BUILD_SRCDIR_BASE}/builds/default" "${BUILD_SRCDIR_BASE}/builds/musl-hardened" "${BUILD_SRCDIR_BASE}/builds/mergedusr" ; do mkdir -p "${d}" pushd "${d}" >/dev/null for f in $(ls stage3-ppc-*xz | grep -v latest | give_latest_from_dates) ; do @@ -56,7 +56,7 @@ post_build() { upload default/stage3-ppc-systemd-*${TIMESTAMP}*.xz* ;; ppc32/stage3-systemd-mu.spec) - upload default/stage3-ppc-systemd-mergedusr-*${TIMESTAMP}*.xz* + upload mergedusr/stage3-ppc-systemd-mergedusr-*${TIMESTAMP}*.xz* ;; ppc32/stage3-musl-hardened-openrc.spec) upload musl-hardened/stage3-ppc-musl-hardened-openrc-*${TIMESTAMP}*.xz* @@ -68,7 +68,7 @@ post_build() { upload default/stage3-ppc64-systemd-*${TIMESTAMP}*.xz* ;; ppc64/stage3-systemd-mu.spec) - upload default/stage3-ppc64-systemd-mergedusr-*${TIMESTAMP}*.xz* + upload mergedusr/stage3-ppc64-systemd-mergedusr-*${TIMESTAMP}*.xz* ;; ppc64/stage3-musl-hardened-openrc.spec) upload musl-hardened/stage3-ppc64-musl-hardened-openrc-*${TIMESTAMP}*.xz* diff --git a/tools/catalyst-auto-ppc64le.conf b/tools/catalyst-auto-ppc64le.conf index bd380359..b8999b35 100644 --- a/tools/catalyst-auto-ppc64le.conf +++ b/tools/catalyst-auto-ppc64le.conf @@ -25,7 +25,7 @@ EMAIL_SUBJECT_PREPEND="[ppc64le-auto]" update_symlinks() { # Symlink the latest stages3 to build from local d f t - for d in "${BUILD_SRCDIR_BASE}"/builds/{default,power9le,power9le-mergedusr,musl-hardened,power9le-musl-hardened} ; do + for d in "${BUILD_SRCDIR_BASE}"/builds/{default,mergedusr,power9le,power9le-mergedusr,musl-hardened,power9le-musl-hardened} ; do mkdir -p "${d}" pushd "${d}" >/dev/null for t in ppc64le power9le; do @@ -54,7 +54,7 @@ post_build() { upload default/stage3-ppc64le-systemd-${TIMESTAMP}*.xz* ;; stage3-systemd-mu.spec) - upload default/stage3-ppc64le-systemd-mergedusr-${TIMESTAMP}*.xz* + upload mergedusr/stage3-ppc64le-systemd-mergedusr-${TIMESTAMP}*.xz* ;; stage3-openrc-power9le.spec) upload power9le/stage3-power9le-openrc-${TIMESTAMP}*.xz*