From 41b326db870cbbb7d2bcdd72b4aa36b1d5881017 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20K=2E=20H=C3=BCttel?= Date: Wed, 23 Nov 2022 15:20:03 +0100 Subject: [PATCH] Move arm64 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 --- .../specs/arm64/llvm/stage1-systemd-mu.spec | 4 +- .../specs/arm64/llvm/stage3-systemd-mu.spec | 4 +- releases/specs/arm64/stage1-systemd-mu.spec | 4 +- releases/specs/arm64/stage3-systemd-mu.spec | 4 +- tools/catalyst-auto-arm64.conf | 51 +++++++------------ 5 files changed, 27 insertions(+), 40 deletions(-) diff --git a/releases/specs/arm64/llvm/stage1-systemd-mu.spec b/releases/specs/arm64/llvm/stage1-systemd-mu.spec index e4964445..221f7480 100644 --- a/releases/specs/arm64/llvm/stage1-systemd-mu.spec +++ b/releases/specs/arm64/llvm/stage1-systemd-mu.spec @@ -1,10 +1,10 @@ subarch: arm64 target: stage1 version_stamp: llvm-systemd-mergedusr-@TIMESTAMP@ -rel_type: llvm +rel_type: llvm-mergedusr profile: default/linux/arm64/17.0/systemd/llvm/merged-usr snapshot: @TIMESTAMP@ -source_subpath: llvm/stage3-arm64-llvm-systemd-mergedusr-latest.tar.xz +source_subpath: llvm-mergedusr/stage3-arm64-llvm-systemd-mergedusr-latest.tar.xz compression_mode: pixz update_seed: no update_seed_command: --update --deep --jobs=5 --newuse --complete-graph @world diff --git a/releases/specs/arm64/llvm/stage3-systemd-mu.spec b/releases/specs/arm64/llvm/stage3-systemd-mu.spec index c77231f1..4884c769 100644 --- a/releases/specs/arm64/llvm/stage3-systemd-mu.spec +++ b/releases/specs/arm64/llvm/stage3-systemd-mu.spec @@ -1,10 +1,10 @@ subarch: arm64 target: stage3 version_stamp: llvm-systemd-mergedusr-@TIMESTAMP@ -rel_type: llvm +rel_type: llvm-mergedusr profile: default/linux/arm64/17.0/systemd/llvm/merged-usr snapshot: @TIMESTAMP@ -source_subpath: llvm/stage1-arm64-llvm-systemd-mergedusr-@TIMESTAMP@.tar.xz +source_subpath: llvm-mergedusr/stage1-arm64-llvm-systemd-mergedusr-@TIMESTAMP@.tar.xz compression_mode: pixz portage_confdir: @REPO_DIR@/releases/portage/stages portage_prefix: releng diff --git a/releases/specs/arm64/stage1-systemd-mu.spec b/releases/specs/arm64/stage1-systemd-mu.spec index 5ad0107d..6299d774 100644 --- a/releases/specs/arm64/stage1-systemd-mu.spec +++ b/releases/specs/arm64/stage1-systemd-mu.spec @@ -1,10 +1,10 @@ subarch: arm64 target: stage1 version_stamp: systemd-mergedusr-@TIMESTAMP@ -rel_type: default +rel_type: mergedusr profile: default/linux/arm64/17.0/systemd/merged-usr snapshot: @TIMESTAMP@ -source_subpath: default/stage3-arm64-systemd-mergedusr-latest.tar.xz +source_subpath: mergedusr/stage3-arm64-systemd-mergedusr-latest.tar.xz compression_mode: pixz update_seed: no update_seed_command: --update --deep --jobs=5 --newuse --complete-graph @world diff --git a/releases/specs/arm64/stage3-systemd-mu.spec b/releases/specs/arm64/stage3-systemd-mu.spec index a7baf7b7..e52debde 100644 --- a/releases/specs/arm64/stage3-systemd-mu.spec +++ b/releases/specs/arm64/stage3-systemd-mu.spec @@ -1,10 +1,10 @@ subarch: arm64 target: stage3 version_stamp: systemd-mergedusr-@TIMESTAMP@ -rel_type: default +rel_type: mergedusr profile: default/linux/arm64/17.0/systemd/merged-usr snapshot: @TIMESTAMP@ -source_subpath: default/stage1-arm64-systemd-mergedusr-@TIMESTAMP@.tar.xz +source_subpath: mergedusr/stage1-arm64-systemd-mergedusr-@TIMESTAMP@.tar.xz compression_mode: pixz portage_confdir: @REPO_DIR@/releases/portage/stages portage_prefix: releng diff --git a/tools/catalyst-auto-arm64.conf b/tools/catalyst-auto-arm64.conf index 9b509fd1..474a1eca 100644 --- a/tools/catalyst-auto-arm64.conf +++ b/tools/catalyst-auto-arm64.conf @@ -6,7 +6,7 @@ UPLOAD_KEY=/root/.ssh/id_ed25519 SPECS_DIR=${REPO_DIR}/releases/specs/arm64 SUBARCH=arm64 -SETS="openrc llvmopenrc systemd systemd_mu llvmsystemd llvmsystemd_mu musl muslhardened muslllvm" +SETS="openrc llvm_openrc systemd systemd_mu llvm_systemd llvm_systemd_mu musl musl_hardened musl_llvm" SET_openrc_SPECS="stage1-openrc.spec stage3-openrc.spec stage3d-openrc.spec" SET_openrc_OPTIONAL_SPECS="installcd-stage1.spec installcd-stage2-minimal.spec" @@ -14,15 +14,17 @@ SET_openrc_OPTIONAL_SPECS="installcd-stage1.spec installcd-stage2-minimal.spec" SET_systemd_SPECS="stage1-systemd.spec stage3-systemd.spec stage3d-systemd.spec" SET_systemd_mu_SPECS="stage1-systemd-mu.spec stage3-systemd-mu.spec" -SET_llvmopenrc_SPECS="llvm/stage1-openrc.spec llvm/stage3-openrc.spec" +SET_llvm_openrc_SPECS="llvm/stage1-openrc.spec llvm/stage3-openrc.spec" -SET_llvmsystemd_SPECS="llvm/stage1-systemd.spec llvm/stage3-systemd.spec" -SET_llvmsystemd_mu_SPECS="llvm/stage1-systemd-mu.spec llvm/stage3-systemd-mu.spec" +SET_llvm_systemd_SPECS="llvm/stage1-systemd.spec llvm/stage3-systemd.spec" +SET_llvm_systemd_mu_SPECS="llvm/stage1-systemd-mu.spec llvm/stage3-systemd-mu.spec" SET_musl_SPECS="musl/stage1.spec musl/stage3.spec" -SET_muslhardened_SPECS="musl-hardened/stage1.spec musl-hardened/stage3.spec" -SET_muslllvm_SPECS="musl-llvm/stage1.spec musl-llvm/stage3.spec" +SET_musl_hardened_SPECS="musl-hardened/stage1.spec musl-hardened/stage3.spec" + +SET_musl_llvm_SPECS="musl-llvm/stage1.spec musl-llvm/stage3.spec" + KCONFIG_DIR=${REPO_DIR}/releases/kconfig/arm64 @@ -31,7 +33,7 @@ EMAIL_SUBJECT_PREPEND="[${SUBARCH}-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/llvm" "${BUILD_SRCDIR_BASE}/builds/musl" "${BUILD_SRCDIR_BASE}/builds/musl-hardened" "${BUILD_SRCDIR_BASE}/builds/musl-llvm"; do + for d in "${BUILD_SRCDIR_BASE}/builds/default" "${BUILD_SRCDIR_BASE}/builds/mergedusr" "${BUILD_SRCDIR_BASE}/builds/llvm" "${BUILD_SRCDIR_BASE}/builds/llvm-mergedusr" "${BUILD_SRCDIR_BASE}/builds/musl" "${BUILD_SRCDIR_BASE}/builds/musl-hardened" "${BUILD_SRCDIR_BASE}/builds/musl-llvm"; do mkdir -p "${d}" pushd "${d}" >/dev/null for f in $(ls stage3-${SUBARCH}-*xz | grep -v latest | give_latest_from_dates) ; do @@ -46,7 +48,6 @@ post_build() { local set=$1 spec=$2 pushd "${BUILD_SRCDIR_BASE}/builds/default" >/dev/null - case ${spec} in installcd-stage2-minimal.spec) upload install-arm64-*${TIMESTAMP}*.iso* @@ -63,18 +64,18 @@ post_build() { stage3d-systemd.spec) upload stage3-${SUBARCH}-desktop-systemd-${TIMESTAMP}*.xz* ;; + esac + popd >/dev/null + + pushd "${BUILD_SRCDIR_BASE}/builds/mergedusr" >/dev/null + case ${spec} in stage3-systemd-mu.spec) upload stage3-${SUBARCH}-systemd-mergedusr-${TIMESTAMP}*.xz* ;; - *) - echo "Finished ${spec}" - ;; esac - popd >/dev/null pushd "${BUILD_SRCDIR_BASE}/builds/llvm" >/dev/null - case ${spec} in llvm/stage3-openrc.spec) upload stage3-${SUBARCH}-llvm-openrc-${TIMESTAMP}*.xz* @@ -82,52 +83,38 @@ post_build() { llvm/stage3-systemd.spec) upload stage3-${SUBARCH}-llvm-systemd-${TIMESTAMP}*.xz* ;; + esac + popd >/dev/null + + pushd "${BUILD_SRCDIR_BASE}/builds/llvm-mergedusr" >/dev/null + case ${spec} in llvm/stage3-systemd-mu.spec) upload stage3-${SUBARCH}-llvm-systemd-mergedusr-${TIMESTAMP}*.xz* ;; - *) - echo "Finished ${spec}" - ;; esac - popd >/dev/null pushd "${BUILD_SRCDIR_BASE}/builds/musl" >/dev/null - case ${spec} in musl/stage3.spec) upload stage3-${SUBARCH}-*${TIMESTAMP}*.tar.xz* ;; - *) - echo "Finished ${spec}" - ;; esac - popd >/dev/null pushd "${BUILD_SRCDIR_BASE}/builds/musl-hardened" >/dev/null - case ${spec} in musl-hardened/stage3.spec) upload stage3-${SUBARCH}-*${TIMESTAMP}*.tar.xz* ;; - *) - echo "Finished ${spec}" - ;; esac - popd >/dev/null pushd "${BUILD_SRCDIR_BASE}/builds/musl-llvm" >/dev/null - case ${spec} in musl-llvm/stage3.spec) upload stage3-${SUBARCH}-*${TIMESTAMP}*.tar.xz* ;; - *) - echo "Finished ${spec}" - ;; esac - popd >/dev/null }