* [gentoo-commits] proj/releng:master commit in: releases/specs-qemu/loong/, tools/
@ 2022-11-23 21:44 Andreas K. Hüttel
0 siblings, 0 replies; 2+ messages in thread
From: Andreas K. Hüttel @ 2022-11-23 21:44 UTC (permalink / raw
To: gentoo-commits
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
^ permalink raw reply related [flat|nested] 2+ messages in thread* [gentoo-commits] proj/releng:master commit in: releases/specs-qemu/loong/, tools/
@ 2022-11-16 21:51 Andreas K. Hüttel
0 siblings, 0 replies; 2+ messages in thread
From: Andreas K. Hüttel @ 2022-11-16 21:51 UTC (permalink / raw
To: gentoo-commits
commit: 6a55a8d80ab11d93245d0c26dcfa04671ffbf239
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 16 21:48:47 2022 +0000
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Wed Nov 16 21:48:47 2022 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=6a55a8d8
Add loong systemd merged-usr build
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
releases/specs-qemu/loong/stage1-systemd-mu.spec | 13 +++++++++++++
releases/specs-qemu/loong/stage3-systemd-mu.spec | 11 +++++++++++
tools/catalyst-auto-qemu-loong.conf | 18 ++++++++++++++----
3 files changed, 38 insertions(+), 4 deletions(-)
diff --git a/releases/specs-qemu/loong/stage1-systemd-mu.spec b/releases/specs-qemu/loong/stage1-systemd-mu.spec
new file mode 100644
index 00000000..c745deae
--- /dev/null
+++ b/releases/specs-qemu/loong/stage1-systemd-mu.spec
@@ -0,0 +1,13 @@
+subarch: loong
+version_stamp: systemd-mergedusr-@TIMESTAMP@
+target: stage1
+rel_type: default
+profile: default/linux/loong/22.0/la64v100/lp64d/systemd/merged-usr
+snapshot: @TIMESTAMP@
+source_subpath: default/stage3-loong-systemd-mergedusr-latest
+compression_mode: pixz
+update_seed: no
+update_seed_command: -uDN @world
+portage_confdir: @REPO_DIR@/releases/portage/stages-qemu
+portage_prefix: releng
+interpreter: /usr/bin/qemu-loongarch64
diff --git a/releases/specs-qemu/loong/stage3-systemd-mu.spec b/releases/specs-qemu/loong/stage3-systemd-mu.spec
new file mode 100644
index 00000000..5de56ba7
--- /dev/null
+++ b/releases/specs-qemu/loong/stage3-systemd-mu.spec
@@ -0,0 +1,11 @@
+subarch: loong
+version_stamp: systemd-mergedusr-@TIMESTAMP@
+target: stage3
+rel_type: default
+profile: default/linux/loong/22.0/la64v100/lp64d/systemd/merged-usr
+snapshot: @TIMESTAMP@
+source_subpath: default/stage1-loong-systemd-mergedusr-@TIMESTAMP@
+compression_mode: pixz
+portage_confdir: @REPO_DIR@/releases/portage/stages-qemu
+portage_prefix: releng
+interpreter: /usr/bin/qemu-loongarch64
diff --git a/tools/catalyst-auto-qemu-loong.conf b/tools/catalyst-auto-qemu-loong.conf
index 5f140c17..69004e40 100644
--- a/tools/catalyst-auto-qemu-loong.conf
+++ b/tools/catalyst-auto-qemu-loong.conf
@@ -13,11 +13,15 @@ EMAIL_SUBJECT_PREPEND="[loong-qemu-auto]"
SETS="
openrc
systemd
+ systemd_mu
"
SET_openrc_SPECS="stage1-openrc.spec stage3-openrc.spec"
+
SET_systemd_SPECS="stage1-systemd.spec stage3-systemd.spec"
+SET_systemd_mu_SPECS="stage1-systemd-mu.spec stage3-systemd-mu.spec"
+
update_symlinks() {
# Symlink the latest stages3 to build from
local d f
@@ -34,14 +38,20 @@ update_symlinks() {
post_build() {
local set=$1 spec=$2
+ pushd "${BUILD_SRCDIR_BASE}/builds/default" >/dev/null
case ${spec} in
- stage3*.spec)
- pushd "${BUILD_SRCDIR_BASE}/builds/default" >/dev/null
- upload stage3-loong-$(echo ${spec}|sed -e 's:^stage3-::g' -e 's:\.spec$::g')-${TIMESTAMP}*.xz*
- popd >/dev/null
+ stage3-openrc.spec)
+ upload stage3-loong-openrc-${TIMESTAMP}*.xz*
+ ;;
+ stage3-systemd.spec)
+ upload stage3-loong-systemd-${TIMESTAMP}*.xz*
+ ;;
+ stage3-systemd-mu.spec)
+ upload stage3-loong-systemd-mergedusr-${TIMESTAMP}*.xz*
;;
*)
echo "Finished ${spec}"
;;
esac
+ popd >/dev/null
}
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2022-11-23 21:44 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-11-23 21:44 [gentoo-commits] proj/releng:master commit in: releases/specs-qemu/loong/, tools/ Andreas K. Hüttel
-- strict thread matches above, loose matches on Subject: below --
2022-11-16 21:51 Andreas K. Hüttel
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox