From ed6083970d9b2769e6d9f42781c0665da66c4ebc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20K=2E=20H=C3=BCttel?= Date: Wed, 23 Nov 2022 22:51:55 +0100 Subject: [PATCH] Move mips 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 --- .../mips/stage1-mips64el-n64-systemd-mu.spec | 4 ++-- .../mips/stage1-mipsel3-n64-systemd-mu.spec | 4 ++-- .../mips/stage3-mips64el-n64-systemd-mu.spec | 4 ++-- .../mips/stage3-mipsel3-n64-systemd-mu.spec | 4 ++-- tools/catalyst-auto-qemu-mips-common | 18 +++++++++--------- 5 files changed, 17 insertions(+), 17 deletions(-) diff --git a/releases/specs-qemu/mips/stage1-mips64el-n64-systemd-mu.spec b/releases/specs-qemu/mips/stage1-mips64el-n64-systemd-mu.spec index 95120cde..b2969905 100644 --- a/releases/specs-qemu/mips/stage1-mips64el-n64-systemd-mu.spec +++ b/releases/specs-qemu/mips/stage1-mips64el-n64-systemd-mu.spec @@ -2,10 +2,10 @@ subarch: mips64el_n64 target: stage1 version_stamp: systemd-mergedusr-@TIMESTAMP@ interpreter: /usr/bin/qemu-mips64el -rel_type: default +rel_type: mergedusr profile: default/linux/mips/17.0/mipsel/n64/systemd/merged-usr snapshot: @TIMESTAMP@ -source_subpath: default/stage3-mips64el_n64-systemd-mergedusr-latest +source_subpath: mergedusr/stage3-mips64el_n64-systemd-mergedusr-latest compression_mode: pixz decompressor_search_order: xz bzip2 update_seed: no diff --git a/releases/specs-qemu/mips/stage1-mipsel3-n64-systemd-mu.spec b/releases/specs-qemu/mips/stage1-mipsel3-n64-systemd-mu.spec index 7de26fdb..2eb2b5eb 100644 --- a/releases/specs-qemu/mips/stage1-mipsel3-n64-systemd-mu.spec +++ b/releases/specs-qemu/mips/stage1-mipsel3-n64-systemd-mu.spec @@ -2,10 +2,10 @@ subarch: mipsel3_n64 target: stage1 version_stamp: systemd-mergedusr-@TIMESTAMP@ interpreter: /usr/bin/qemu-mips64el -rel_type: default +rel_type: mergedusr profile: default/linux/mips/17.0/mipsel/n64/systemd/merged-usr snapshot: @TIMESTAMP@ -source_subpath: default/stage3-mipsel3_n64-systemd-mergedusr-latest +source_subpath: mergedusr/stage3-mipsel3_n64-systemd-mergedusr-latest compression_mode: pixz decompressor_search_order: xz bzip2 update_seed: no diff --git a/releases/specs-qemu/mips/stage3-mips64el-n64-systemd-mu.spec b/releases/specs-qemu/mips/stage3-mips64el-n64-systemd-mu.spec index cdbe66ff..3fa7fe32 100644 --- a/releases/specs-qemu/mips/stage3-mips64el-n64-systemd-mu.spec +++ b/releases/specs-qemu/mips/stage3-mips64el-n64-systemd-mu.spec @@ -2,10 +2,10 @@ subarch: mips64el_n64 target: stage3 version_stamp: systemd-mergedusr-@TIMESTAMP@ interpreter: /usr/bin/qemu-mips64el -rel_type: default +rel_type: mergedusr profile: default/linux/mips/17.0/mipsel/n64/systemd/merged-usr snapshot: @TIMESTAMP@ -source_subpath: default/stage1-mips64el_n64-systemd-mergedusr-@TIMESTAMP@ +source_subpath: mergedusr/stage1-mips64el_n64-systemd-mergedusr-@TIMESTAMP@ compression_mode: pixz decompressor_search_order: xz bzip2 portage_confdir: @REPO_DIR@/releases/portage/stages-qemu diff --git a/releases/specs-qemu/mips/stage3-mipsel3-n64-systemd-mu.spec b/releases/specs-qemu/mips/stage3-mipsel3-n64-systemd-mu.spec index d8e38008..89121089 100644 --- a/releases/specs-qemu/mips/stage3-mipsel3-n64-systemd-mu.spec +++ b/releases/specs-qemu/mips/stage3-mipsel3-n64-systemd-mu.spec @@ -2,10 +2,10 @@ subarch: mipsel3_n64 target: stage3 version_stamp: systemd-mergedusr-@TIMESTAMP@ interpreter: /usr/bin/qemu-mips64el -rel_type: default +rel_type: mergedusr profile: default/linux/mips/17.0/mipsel/n64/systemd/merged-usr snapshot: @TIMESTAMP@ -source_subpath: default/stage1-mipsel3_n64-systemd-mergedusr-@TIMESTAMP@ +source_subpath: mergedusr/stage1-mipsel3_n64-systemd-mergedusr-@TIMESTAMP@ compression_mode: pixz decompressor_search_order: xz bzip2 portage_confdir: @REPO_DIR@/releases/portage/stages-qemu diff --git a/tools/catalyst-auto-qemu-mips-common b/tools/catalyst-auto-qemu-mips-common index 8ec6a8ab..27a327ae 100644 --- a/tools/catalyst-auto-qemu-mips-common +++ b/tools/catalyst-auto-qemu-mips-common @@ -54,7 +54,7 @@ KCONFIG_DIR=${REPO_DIR}/releases/kconfig/mips 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 @@ -69,7 +69,6 @@ post_build() { local set=$1 spec=$2 pushd "${BUILD_SRCDIR_BASE}/builds/default" >/dev/null - case ${spec} in stage3-mips2-o32-openrc.spec) upload stage3-mips2-openrc-${TIMESTAMP}.tar.xz* @@ -113,9 +112,6 @@ post_build() { stage3-mipsel3-n64-systemd.spec) upload stage3-mipsel3_n64-systemd-${TIMESTAMP}.tar.xz* ;; - stage3-mipsel3-n64-systemd-mu.spec) - upload stage3-mipsel3_n64-systemd-mergedusr-${TIMESTAMP}.tar.xz* - ;; stage3-mips64-n32-openrc.spec) upload stage3-mips64_n32-openrc-${TIMESTAMP}.tar.xz* ;; @@ -137,13 +133,17 @@ post_build() { stage3-mips64el-n64-systemd.spec) upload stage3-mips64el_n64-systemd-${TIMESTAMP}.tar.xz* ;; + esac + popd >/dev/null + + pushd "${BUILD_SRCDIR_BASE}/builds/mergedusr" >/dev/null + case ${spec} in + stage3-mipsel3-n64-systemd-mu.spec) + upload stage3-mipsel3_n64-systemd-mergedusr-${TIMESTAMP}.tar.xz* + ;; stage3-mips64el-n64-systemd-mu.spec) upload stage3-mips64el_n64-systemd-mergedusr-${TIMESTAMP}.tar.xz* ;; - *) - echo "Finished ${spec}" - ;; esac - popd >/dev/null }