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

Move alpha 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 00:34:50 +01:00
parent e287f97a8c
commit d0bcb1b30a
No known key found for this signature in database
GPG key ID: DC2B16215ED5412A
3 changed files with 17 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1,10 +1,10 @@
subarch: alpha subarch: alpha
target: stage1 target: stage1
version_stamp: systemd-mergedusr-@TIMESTAMP@ version_stamp: systemd-mergedusr-@TIMESTAMP@
rel_type: default rel_type: mergedusr
profile: default/linux/alpha/17.0/systemd/merged-usr profile: default/linux/alpha/17.0/systemd/merged-usr
snapshot: @TIMESTAMP@ snapshot: @TIMESTAMP@
source_subpath: default/stage3-alpha-systemd-mergedusr-latest source_subpath: mergedusr/stage3-alpha-systemd-mergedusr-latest
update_seed: yes update_seed: yes
update_seed_command: -uDN @world update_seed_command: -uDN @world
portage_confdir: @REPO_DIR@/releases/portage/stages-qemu portage_confdir: @REPO_DIR@/releases/portage/stages-qemu

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

@ -1,10 +1,10 @@
subarch: alpha subarch: alpha
target: stage3 target: stage3
version_stamp: systemd-mergedusr-@TIMESTAMP@ version_stamp: systemd-mergedusr-@TIMESTAMP@
rel_type: default rel_type: mergedusr
profile: default/linux/alpha/17.0/systemd/merged-usr profile: default/linux/alpha/17.0/systemd/merged-usr
snapshot: @TIMESTAMP@ snapshot: @TIMESTAMP@
source_subpath: default/stage1-alpha-systemd-mergedusr-@TIMESTAMP@ source_subpath: mergedusr/stage1-alpha-systemd-mergedusr-@TIMESTAMP@
portage_confdir: @REPO_DIR@/releases/portage/stages-qemu portage_confdir: @REPO_DIR@/releases/portage/stages-qemu
interpreter: /usr/bin/qemu-alpha interpreter: /usr/bin/qemu-alpha
compression_mode: pixz compression_mode: pixz

26
tools/catalyst-auto-qemu-alpha.conf
View file

@ -6,21 +6,21 @@ UPLOAD_KEY=/root/.ssh/id_rsa
SPECS_DIR=${REPO_DIR}/releases/specs-qemu/alpha SPECS_DIR=${REPO_DIR}/releases/specs-qemu/alpha
EMAIL_SUBJECT_PREPEND="[alpha-qemu-auto]" EMAIL_SUBJECT_PREPEND="[alpha-qemu-auto]"
SETS="openrc systemd systemdmu" SETS="openrc systemd systemd_mu"
SET_openrc_SPECS="stage1-openrc.spec stage3-openrc.spec" SET_openrc_SPECS="stage1-openrc.spec stage3-openrc.spec"
SET_openrc_OPTIONAL_SPECS="installcd-stage1.spec installcd-stage2-minimal.spec" SET_openrc_OPTIONAL_SPECS="installcd-stage1.spec installcd-stage2-minimal.spec"
SET_systemd_SPECS="stage1-systemd.spec stage3-systemd.spec" SET_systemd_SPECS="stage1-systemd.spec stage3-systemd.spec"
SET_systemdmu_SPECS="stage1-systemd-mu.spec stage3-systemd-mu.spec" SET_systemd_mu_SPECS="stage1-systemd-mu.spec stage3-systemd-mu.spec"
KCONFIG_DIR=${REPO_DIR}/releases/kconfig/alpha KCONFIG_DIR=${REPO_DIR}/releases/kconfig/alpha
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
@ -35,24 +35,24 @@ post_build() {
local set=$1 spec=$2 local set=$1 spec=$2
pushd "${BUILD_SRCDIR_BASE}/builds/default" >/dev/null pushd "${BUILD_SRCDIR_BASE}/builds/default" >/dev/null
case ${spec} in case ${spec} in
installcd-stage2-minimal.spec) installcd-stage2-minimal.spec)
upload *-${TIMESTAMP}*.iso* upload install-alpha-minimal-${TIMESTAMP}.iso*
;; ;;
stage3-openrc.spec) stage3-openrc.spec)
upload stage3-*openrc-${TIMESTAMP}*.xz* upload stage3-alpha-openrc-${TIMESTAMP}.tar.xz*
;; ;;
stage3-systemd.spec) stage3-systemd.spec)
upload stage3-*systemd-${TIMESTAMP}*.xz* upload stage3-alpha-systemd-${TIMESTAMP}.tar.xz*
;;
stage3-systemd-mu.spec)
upload stage3-*systemd-mergedusr-${TIMESTAMP}*.xz*
;;
*)
echo "Finished ${spec}"
;; ;;
esac esac
popd >/dev/null
pushd "${BUILD_SRCDIR_BASE}/builds/mergedusr" >/dev/null
case ${spec} in
stage3-systemd-mu.spec)
upload stage3-alpha-systemd-mergedusr-${TIMESTAMP}.tar.xz*
;;
esac
popd >/dev/null popd >/dev/null
} }