commit: 216dea7382a27f0448ce7114dd46d4b5aa010e06
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 23 21:31:02 2022 +0000
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Wed Nov 23 21:33:00 2022 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=216dea73
Move ia64 merged-usr builds to separate build types
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
releases/specs/ia64/stage1-systemd-mu.spec | 4 ++--
releases/specs/ia64/stage3-systemd-mu.spec | 4 ++--
tools/catalyst-auto-ia64.conf | 32 ++++++++++++++++++++----------
3 files changed, 25 insertions(+), 15 deletions(-)
diff --git a/releases/specs/ia64/stage1-systemd-mu.spec
b/releases/specs/ia64/stage1-systemd-mu.spec
index b3939d02..5dddd4e2 100644
--- a/releases/specs/ia64/stage1-systemd-mu.spec
+++ b/releases/specs/ia64/stage1-systemd-mu.spec
@@ -1,10 +1,10 @@
subarch: ia64
version_stamp: systemd-mergedusr-@TIMESTAMP@
target: stage1
-rel_type: default
+rel_type: mergedusr
profile: default/linux/ia64/17.0/systemd/merged-usr
snapshot: @TIMESTAMP@
-source_subpath: default/stage3-ia64-systemd-mergedusr-latest
+source_subpath: mergedusr/stage3-ia64-systemd-mergedusr-latest
compression_mode: pixz
update_seed: no
update_seed_command: --update --deep --newuse @world
diff --git a/releases/specs/ia64/stage3-systemd-mu.spec
b/releases/specs/ia64/stage3-systemd-mu.spec
index 02619c36..2750d3f6 100644
--- a/releases/specs/ia64/stage3-systemd-mu.spec
+++ b/releases/specs/ia64/stage3-systemd-mu.spec
@@ -1,10 +1,10 @@
subarch: ia64
version_stamp: systemd-mergedusr-@TIMESTAMP@
target: stage3
-rel_type: default
+rel_type: mergedusr
profile: default/linux/ia64/17.0/systemd/merged-usr
snapshot: @TIMESTAMP@
-source_subpath: default/stage1-ia64-systemd-mergedusr-@TIMESTAMP@
+source_subpath: mergedusr/stage1-ia64-systemd-mergedusr-@TIMESTAMP@
compression_mode: pixz
portage_confdir: @REPO_DIR@/releases/portage/stages
portage_prefix: releng
diff --git a/tools/catalyst-auto-ia64.conf b/tools/catalyst-auto-ia64.conf
index bfefa37d..8a54b0f1 100644
--- a/tools/catalyst-auto-ia64.conf
+++ b/tools/catalyst-auto-ia64.conf
@@ -5,15 +5,25 @@ UPLOAD_USER=ia64
UPLOAD_KEY=/root/.ssh/id_rsa
SPECS_DIR=${REPO_DIR}/releases/specs/ia64
-SPECS="stage1-openrc.spec stage3-openrc.spec stage1-systemd.spec
stage3-systemd.spec stage1-systemd-mu.spec stage3-systemd-mu.spec"
-OPTIONAL_SPECS="installcd-stage1.spec installcd-stage2-minimal.spec"
+SETS="
+ openrc
+ systemd
+ systemd_mu
+"
+
+SET_openrc_SPECS="stage1-openrc.spec stage3-openrc.spec"
+SET_openrc_OPTIONAL_SPECS="installcd-stage1.spec installcd-stage2-minimal.spec"
+
+SET_systemd_SPECS="stage1-systemd.spec stage3-systemd.spec"
+
+SET_systemd_mu_SPECS="stage1-systemd-mu.spec stage3-systemd-mu.spec"
KCONFIG_DIR=${REPO_DIR}/releases/kconfig/ia64
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
@@ -28,24 +38,24 @@ post_build() {
local set=$1 spec=$2
pushd "${BUILD_SRCDIR_BASE}/builds/default" >/dev/null
-
case ${spec} in
installcd-stage2*)
upload *${TIMESTAMP}*.iso*
;;
stage3-openrc.spec)
- upload stage3-*openrc-${TIMESTAMP}*.xz*
+ upload stage3-ia64-openrc-${TIMESTAMP}.xz*
;;
stage3-systemd.spec)
- upload stage3-*systemd-${TIMESTAMP}*.xz*
+ upload stage3-ia64-systemd-${TIMESTAMP}.xz*
;;
+ esac
+ popd >/dev/null
+
+ pushd "${BUILD_SRCDIR_BASE}/builds/default" >/dev/null
+ case ${spec} in
stage3-systemd-mu.spec)
- upload stage3-*systemd-mergedusr-${TIMESTAMP}*.xz*
- ;;
- *)
- echo "Finished ${spec}"
+ upload stage3-ia64-systemd-mergedusr-${TIMESTAMP}.xz*
;;
esac
-
popd >/dev/null
}
