commit: f45dc8ad27cdf6b85997b041dcc25c20af2b6816
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 23 21:42:17 2022 +0000
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Wed Nov 23 21:43:21 2022 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=f45dc8ad
Move loong merged-usr builds to separate build types
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
releases/specs-qemu/loong/stage1-systemd-mu.spec | 4 ++--
releases/specs-qemu/loong/stage3-systemd-mu.spec | 4 ++--
tools/catalyst-auto-qemu-loong.conf | 16 +++++++++-------
3 files changed, 13 insertions(+), 11 deletions(-)
diff --git a/releases/specs-qemu/loong/stage1-systemd-mu.spec
b/releases/specs-qemu/loong/stage1-systemd-mu.spec
index a8db77ee..9506fb4e 100644
--- a/releases/specs-qemu/loong/stage1-systemd-mu.spec
+++ b/releases/specs-qemu/loong/stage1-systemd-mu.spec
@@ -1,10 +1,10 @@
subarch: loong
version_stamp: systemd-mergedusr-@TIMESTAMP@
target: stage1
-rel_type: default
+rel_type: mergedusr
profile: default/linux/loong/22.0/la64v100/lp64d/systemd/merged-usr
snapshot: @TIMESTAMP@
-source_subpath: default/stage3-loong-systemd-mergedusr-latest
+source_subpath: mergedusr/stage3-loong-systemd-mergedusr-latest
compression_mode: pixz
update_seed: yes
update_seed_command: -uDN @world
diff --git a/releases/specs-qemu/loong/stage3-systemd-mu.spec
b/releases/specs-qemu/loong/stage3-systemd-mu.spec
index 5de56ba7..e042c925 100644
--- a/releases/specs-qemu/loong/stage3-systemd-mu.spec
+++ b/releases/specs-qemu/loong/stage3-systemd-mu.spec
@@ -1,10 +1,10 @@
subarch: loong
version_stamp: systemd-mergedusr-@TIMESTAMP@
target: stage3
-rel_type: default
+rel_type: mergedusr
profile: default/linux/loong/22.0/la64v100/lp64d/systemd/merged-usr
snapshot: @TIMESTAMP@
-source_subpath: default/stage1-loong-systemd-mergedusr-@TIMESTAMP@
+source_subpath: mergedusr/stage1-loong-systemd-mergedusr-@TIMESTAMP@
compression_mode: pixz
portage_confdir: @REPO_DIR@/releases/portage/stages-qemu
portage_prefix: releng
diff --git a/tools/catalyst-auto-qemu-loong.conf
b/tools/catalyst-auto-qemu-loong.conf
index 39d7e149..0c2be771 100644
--- a/tools/catalyst-auto-qemu-loong.conf
+++ b/tools/catalyst-auto-qemu-loong.conf
@@ -25,7 +25,7 @@ SET_systemd_mu_SPECS="stage1-systemd-mu.spec
stage3-systemd-mu.spec"
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
@@ -42,16 +42,18 @@ post_build() {
pushd "${BUILD_SRCDIR_BASE}/builds/default" >/dev/null
case ${spec} in
stage3-openrc.spec)
- upload stage3-loong-openrc-${TIMESTAMP}*.xz*
+ upload stage3-loong-openrc-${TIMESTAMP}.xz*
;;
stage3-systemd.spec)
- upload stage3-loong-systemd-${TIMESTAMP}*.xz*
+ upload stage3-loong-systemd-${TIMESTAMP}.xz*
;;
+ esac
+ popd >/dev/null
+
+ pushd "${BUILD_SRCDIR_BASE}/builds/mergedusr" >/dev/null
+ case ${spec} in
stage3-systemd-mu.spec)
- upload stage3-loong-systemd-mergedusr-${TIMESTAMP}*.xz*
- ;;
- *)
- echo "Finished ${spec}"
+ upload stage3-loong-systemd-mergedusr-${TIMESTAMP}.xz*
;;
esac
popd >/dev/null
