chadmed/gentoo-asahi-releng
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Move loong merged-usr builds to separate build types

Browse source 
Signed-off-by: Andreas K. Hüttel <dilfridge@gentoo.org>
This commit is contained in:
Andreas K. Hüttel 2022-11-23 22:42:17 +01:00
parent 216dea7382
commit f45dc8ad27
No known key found for this signature in database
GPG key ID: DC2B16215ED5412A
3 changed files with 13 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
releases/specs-qemu/loong/stage1-systemd-mu.spec
View file

@ -1,10 +1,10 @@
subarch: loong subarch: loong
version_stamp: systemd-mergedusr-@TIMESTAMP@ version_stamp: systemd-mergedusr-@TIMESTAMP@
target: stage1 target: stage1
rel_type: default rel_type: mergedusr
profile: default/linux/loong/22.0/la64v100/lp64d/systemd/merged-usr profile: default/linux/loong/22.0/la64v100/lp64d/systemd/merged-usr
snapshot: @TIMESTAMP@ snapshot: @TIMESTAMP@
source_subpath: default/stage3-loong-systemd-mergedusr-latest source_subpath: mergedusr/stage3-loong-systemd-mergedusr-latest
compression_mode: pixz compression_mode: pixz
update_seed: yes update_seed: yes
update_seed_command: -uDN @world update_seed_command: -uDN @world

4
releases/specs-qemu/loong/stage3-systemd-mu.spec
View file

@ -1,10 +1,10 @@
subarch: loong subarch: loong
version_stamp: systemd-mergedusr-@TIMESTAMP@ version_stamp: systemd-mergedusr-@TIMESTAMP@
target: stage3 target: stage3
rel_type: default rel_type: mergedusr
profile: default/linux/loong/22.0/la64v100/lp64d/systemd/merged-usr profile: default/linux/loong/22.0/la64v100/lp64d/systemd/merged-usr
snapshot: @TIMESTAMP@ snapshot: @TIMESTAMP@
source_subpath: default/stage1-loong-systemd-mergedusr-@TIMESTAMP@ source_subpath: mergedusr/stage1-loong-systemd-mergedusr-@TIMESTAMP@
compression_mode: pixz compression_mode: pixz
portage_confdir: @REPO_DIR@/releases/portage/stages-qemu portage_confdir: @REPO_DIR@/releases/portage/stages-qemu
portage_prefix: releng portage_prefix: releng

16
tools/catalyst-auto-qemu-loong.conf
View file

@ -25,7 +25,7 @@ SET_systemd_mu_SPECS="stage1-systemd-mu.spec stage3-systemd-mu.spec"
update_symlinks() { update_symlinks() {
# Symlink the latest stages3 to build from # Symlink the latest stages3 to build from
local d f 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}" mkdir -p "${d}"
pushd "${d}" >/dev/null pushd "${d}" >/dev/null
for f in $(ls stage3*xz | grep -v latest | give_latest_from_dates) ; do 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 pushd "${BUILD_SRCDIR_BASE}/builds/default" >/dev/null
case ${spec} in case ${spec} in
stage3-openrc.spec) stage3-openrc.spec)
upload stage3-loong-openrc-${TIMESTAMP}*.xz* upload stage3-loong-openrc-${TIMESTAMP}.xz*
;; ;;
stage3-systemd.spec) 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) stage3-systemd-mu.spec)
upload stage3-loong-systemd-mergedusr-${TIMESTAMP}*.xz* upload stage3-loong-systemd-mergedusr-${TIMESTAMP}.xz*
;;
*)
echo "Finished ${spec}"
;; ;;
esac esac
popd >/dev/null popd >/dev/null