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

Move sparc 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-25 15:30:11 +01:00
parent 33ec0f3264
commit 18335440e9
No known key found for this signature in database
GPG key ID: DC2B16215ED5412A
5 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/sparc/sparc/systemd-stage1-mu.spec
View file

@ -1,10 +1,10 @@
subarch: sparc subarch: sparc
target: stage1 target: stage1
version_stamp: systemd-mergedusr-@TIMESTAMP@ version_stamp: systemd-mergedusr-@TIMESTAMP@
rel_type: default rel_type: mergedusr
profile: default/linux/sparc/17.0/systemd/merged-usr profile: default/linux/sparc/17.0/systemd/merged-usr
snapshot: @TIMESTAMP@ snapshot: @TIMESTAMP@
source_subpath: default/stage3-sparc-systemd-mergedusr-latest source_subpath: mergedusr/stage3-sparc-systemd-mergedusr-latest
compression_mode: pixz compression_mode: pixz
update_seed: no update_seed: no
update_seed_command: --update --deep --newuse @world update_seed_command: --update --deep --newuse @world

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

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

4
releases/specs/sparc/sparc64/systemd-stage1-mu.spec
View file

@ -1,10 +1,10 @@
subarch: sparc64 subarch: sparc64
target: stage1 target: stage1
version_stamp: systemd-mergedusr-@TIMESTAMP@ version_stamp: systemd-mergedusr-@TIMESTAMP@
rel_type: default rel_type: mergedusr
profile: default/linux/sparc/17.0/64ul/systemd/merged-usr profile: default/linux/sparc/17.0/64ul/systemd/merged-usr
snapshot: @TIMESTAMP@ snapshot: @TIMESTAMP@
source_subpath: default/stage3-sparc64-systemd-mergedusr-latest source_subpath: mergedusr/stage3-sparc64-systemd-mergedusr-latest
compression_mode: pixz compression_mode: pixz
update_seed: no update_seed: no
update_seed_command: --update --deep --newuse @world update_seed_command: --update --deep --newuse @world

4
releases/specs/sparc/sparc64/systemd-stage3-mu.spec
View file

@ -1,10 +1,10 @@
subarch: sparc64 subarch: sparc64
target: stage3 target: stage3
version_stamp: systemd-mergedusr-@TIMESTAMP@ version_stamp: systemd-mergedusr-@TIMESTAMP@
rel_type: default rel_type: mergedusr
profile: default/linux/sparc/17.0/64ul/systemd/merged-usr profile: default/linux/sparc/17.0/64ul/systemd/merged-usr
snapshot: @TIMESTAMP@ snapshot: @TIMESTAMP@
source_subpath: default/stage1-sparc64-systemd-mergedusr-@TIMESTAMP@ source_subpath: mergedusr/stage1-sparc64-systemd-mergedusr-@TIMESTAMP@
compression_mode: pixz compression_mode: pixz
portage_confdir: @REPO_DIR@/releases/portage/stages portage_confdir: @REPO_DIR@/releases/portage/stages
portage_prefix: releng portage_prefix: releng

18
tools/catalyst-auto-sparc64.conf
View file

@ -15,7 +15,7 @@ EMAIL_SUBJECT_PREPEND="[sparc-auto]"
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-sparc-*xz | grep -v latest | give_latest_from_dates) ; do for f in $(ls stage3-sparc-*xz | grep -v latest | give_latest_from_dates) ; do
@ -34,7 +34,6 @@ 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
sparc64/installcd-stage2-minimal.spec) sparc64/installcd-stage2-minimal.spec)
upload *${TIMESTAMP}*.iso* upload *${TIMESTAMP}*.iso*
@ -45,22 +44,23 @@ post_build() {
sparc/systemd-stage3.spec) sparc/systemd-stage3.spec)
upload stage3-sparc-systemd-${TIMESTAMP}*.xz* upload stage3-sparc-systemd-${TIMESTAMP}*.xz*
;; ;;
sparc/systemd-stage3-mu.spec)
upload stage3-sparc-systemd-mergedusr-${TIMESTAMP}*.xz*
;;
sparc64/stage3.spec) sparc64/stage3.spec)
upload stage3-sparc64-${TIMESTAMP}*.xz* upload stage3-sparc64-${TIMESTAMP}*.xz*
;; ;;
sparc64/systemd-stage3.spec) sparc64/systemd-stage3.spec)
upload stage3-sparc64-systemd-${TIMESTAMP}*.xz* upload stage3-sparc64-systemd-${TIMESTAMP}*.xz*
;; ;;
esac
popd >/dev/null
pushd "${BUILD_SRCDIR_BASE}/builds/mergedusr" >/dev/null
case ${spec} in
sparc/systemd-stage3-mu.spec)
upload stage3-sparc-systemd-mergedusr-${TIMESTAMP}*.xz*
;;
sparc64/systemd-stage3-mu.spec) sparc64/systemd-stage3-mu.spec)
upload stage3-sparc64-systemd-mergedusr-${TIMESTAMP}*.xz* upload stage3-sparc64-systemd-mergedusr-${TIMESTAMP}*.xz*
;; ;;
*)
echo "Finished ${spec}"
;;
esac esac
popd >/dev/null popd >/dev/null
} }