From cc592e180ad08de0546a5f473e97818662e915d6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20K=2E=20H=C3=BCttel?= Date: Wed, 23 Nov 2022 22:18:20 +0100 Subject: [PATCH] Move hppa 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/hppa/hppa1.1/stage1-systemd-mu.spec | 4 +-- .../specs/hppa/hppa1.1/stage3-systemd-mu.spec | 4 +-- .../specs/hppa/hppa2.0/stage1-systemd-mu.spec | 4 +-- .../specs/hppa/hppa2.0/stage3-systemd-mu.spec | 4 +-- tools/catalyst-auto-hppa.conf | 30 +++++++++---------- 5 files changed, 23 insertions(+), 23 deletions(-) diff --git a/releases/specs/hppa/hppa1.1/stage1-systemd-mu.spec b/releases/specs/hppa/hppa1.1/stage1-systemd-mu.spec index 2052398d..f4ec0400 100644 --- a/releases/specs/hppa/hppa1.1/stage1-systemd-mu.spec +++ b/releases/specs/hppa/hppa1.1/stage1-systemd-mu.spec @@ -1,10 +1,10 @@ subarch: hppa1.1 target: stage1 version_stamp: systemd-mergedusr-@TIMESTAMP@ -rel_type: default +rel_type: mergedusr profile: default/linux/hppa/17.0/systemd/merged-usr snapshot: @TIMESTAMP@ -source_subpath: default/stage3-hppa1.1-systemd-mergedusr-latest +source_subpath: mergedusr/stage3-hppa1.1-systemd-mergedusr-latest update_seed: no portage_confdir: @REPO_DIR@/releases/portage/stages portage_prefix: releng diff --git a/releases/specs/hppa/hppa1.1/stage3-systemd-mu.spec b/releases/specs/hppa/hppa1.1/stage3-systemd-mu.spec index c77da2ec..5e47d21f 100644 --- a/releases/specs/hppa/hppa1.1/stage3-systemd-mu.spec +++ b/releases/specs/hppa/hppa1.1/stage3-systemd-mu.spec @@ -1,10 +1,10 @@ subarch: hppa1.1 target: stage3 version_stamp: systemd-mergedusr-@TIMESTAMP@ -rel_type: default +rel_type: mergedusr profile: default/linux/hppa/17.0/systemd/merged-usr snapshot: @TIMESTAMP@ -source_subpath: default/stage1-hppa1.1-systemd-mergedusr-@TIMESTAMP@ +source_subpath: mergedusr/stage1-hppa1.1-systemd-mergedusr-@TIMESTAMP@ portage_confdir: @REPO_DIR@/releases/portage/stages portage_prefix: releng compression_mode: pixz diff --git a/releases/specs/hppa/hppa2.0/stage1-systemd-mu.spec b/releases/specs/hppa/hppa2.0/stage1-systemd-mu.spec index 1ba80ebd..e26335ce 100644 --- a/releases/specs/hppa/hppa2.0/stage1-systemd-mu.spec +++ b/releases/specs/hppa/hppa2.0/stage1-systemd-mu.spec @@ -1,10 +1,10 @@ subarch: hppa2.0 target: stage1 version_stamp: systemd-mergedusr-@TIMESTAMP@ -rel_type: default +rel_type: mergedusr profile: default/linux/hppa/17.0/systemd/merged-usr snapshot: @TIMESTAMP@ -source_subpath: default/stage3-hppa2.0-systemd-mergedusr-latest +source_subpath: mergedusr/stage3-hppa2.0-systemd-mergedusr-latest update_seed: no portage_confdir: @REPO_DIR@/releases/portage/stages portage_prefix: releng diff --git a/releases/specs/hppa/hppa2.0/stage3-systemd-mu.spec b/releases/specs/hppa/hppa2.0/stage3-systemd-mu.spec index efec98ad..febdf1cb 100644 --- a/releases/specs/hppa/hppa2.0/stage3-systemd-mu.spec +++ b/releases/specs/hppa/hppa2.0/stage3-systemd-mu.spec @@ -1,10 +1,10 @@ subarch: hppa2.0 target: stage3 version_stamp: systemd-mergedusr-@TIMESTAMP@ -rel_type: default +rel_type: mergedusr profile: default/linux/hppa/17.0/systemd/merged-usr snapshot: @TIMESTAMP@ -source_subpath: default/stage1-hppa2.0-systemd-mergedusr-@TIMESTAMP@ +source_subpath: mergedusr/stage1-hppa2.0-systemd-mergedusr-@TIMESTAMP@ portage_confdir: @REPO_DIR@/releases/portage/stages portage_prefix: releng compression_mode: pixz diff --git a/tools/catalyst-auto-hppa.conf b/tools/catalyst-auto-hppa.conf index 48fb5323..02c4a488 100644 --- a/tools/catalyst-auto-hppa.conf +++ b/tools/catalyst-auto-hppa.conf @@ -28,7 +28,7 @@ EMAIL_SUBJECT_PREPEND="[hppa-auto]" update_symlinks() { # Symlink the latest stages3 to build from local d f t - 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 t in hppa1.1 hppa2.0; do @@ -45,7 +45,6 @@ post_build() { local set=$1 spec=$2 pushd "${BUILD_SRCDIR_BASE}/builds/default" >/dev/null - case ${spec} in netboot-hppa32.spec) mv netboot-hppa1.1-${TIMESTAMP}/netboot32-hppa.lif netboot-hppa1.1-${TIMESTAMP}/netboot-hppa32-${TIMESTAMP}.lif @@ -59,27 +58,28 @@ post_build() { upload install-hppa-minimal-*${TIMESTAMP}*.iso* ;; hppa1.1/stage3-openrc.spec) - upload stage3-hppa1.1-openrc-*${TIMESTAMP}*.xz* + upload stage3-hppa1.1-openrc-${TIMESTAMP}.xz* ;; hppa1.1/stage3-systemd.spec) - upload stage3-hppa1.1-systemd-*${TIMESTAMP}*.xz* - ;; - hppa1.1/stage3-systemd-mu.spec) - upload stage3-hppa1.1-systemd-mergedusr-*${TIMESTAMP}*.xz* + upload stage3-hppa1.1-systemd-${TIMESTAMP}.xz* ;; hppa2.0/stage3-openrc.spec) - upload stage3-hppa2.0-openrc-*${TIMESTAMP}*.xz* + upload stage3-hppa2.0-openrc-${TIMESTAMP}.xz* ;; hppa2.0/stage3-systemd.spec) - upload stage3-hppa2.0-systemd-*${TIMESTAMP}*.xz* - ;; - hppa2.0/stage3-systemd-mu.spec) - upload stage3-hppa2.0-systemd-mergedusr-*${TIMESTAMP}*.xz* - ;; - *) - echo "Finished ${spec}" + upload stage3-hppa2.0-systemd-${TIMESTAMP}.xz* ;; esac + popd >/dev/null + pushd "${BUILD_SRCDIR_BASE}/builds/mergedusr" >/dev/null + case ${spec} in + hppa1.1/stage3-systemd-mu.spec) + upload stage3-hppa1.1-systemd-mergedusr-${TIMESTAMP}.xz* + ;; + hppa2.0/stage3-systemd-mu.spec) + upload stage3-hppa2.0-systemd-mergedusr-${TIMESTAMP}.xz* + ;; + esac popd >/dev/null }