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

Move arm 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 12:18:10 +01:00
parent 41ab93c12f
commit 557a127419
No known key found for this signature in database
GPG key ID: DC2B16215ED5412A
13 changed files with 47 additions and 43 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
releases/specs/arm/armv4tl/stage1-systemd-mu.spec
View file

@ -1,10 +1,10 @@
subarch: armv4tl
version_stamp: systemd-mergedusr-@TIMESTAMP@
target: stage1
rel_type: default
rel_type: mergedusr
profile: default/linux/arm/17.0/armv4t/systemd/merged-usr
snapshot: @TIMESTAMP@
source_subpath: default/stage3-armv4tl-systemd-mergedusr-latest.tar.xz
source_subpath: mergedusr/stage3-armv4tl-systemd-mergedusr-latest.tar.xz
compression_mode: pixz
update_seed: no
update_seed_command: -uDN @world

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

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

4
releases/specs/arm/armv5tel/stage1-systemd-mu.spec
View file

@ -1,10 +1,10 @@
subarch: armv5tel
version_stamp: systemd-mergedusr-@TIMESTAMP@
target: stage1
rel_type: default
rel_type: mergedusr
profile: default/linux/arm/17.0/armv5te/systemd/merged-usr
snapshot: @TIMESTAMP@
source_subpath: default/stage3-armv5tel-systemd-mergedusr-latest.tar.xz
source_subpath: mergedusr/stage3-armv5tel-systemd-mergedusr-latest.tar.xz
compression_mode: pixz
update_seed: no
update_seed_command: -uDN @world

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

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

4
releases/specs/arm/armv6j/stage1-hardfloat-systemd-mu.spec
View file

@ -1,10 +1,10 @@
subarch: armv6j_hardfp
version_stamp: systemd-mergedusr-@TIMESTAMP@
target: stage1
rel_type: default
rel_type: mergedusr
profile: default/linux/arm/17.0/armv6j/systemd/merged-usr
snapshot: @TIMESTAMP@
source_subpath: default/stage3-armv6j_hardfp-systemd-mergedusr-latest.tar.xz
source_subpath: mergedusr/stage3-armv6j_hardfp-systemd-mergedusr-latest.tar.xz
compression_mode: pixz
update_seed: no
update_seed_command: -uDN @world

4
releases/specs/arm/armv6j/stage1-systemd-mu.spec
View file

@ -1,10 +1,10 @@
subarch: armv6j
version_stamp: systemd-mergedusr-@TIMESTAMP@
target: stage1
rel_type: default
rel_type: mergedusr
profile: default/linux/arm/17.0/armv6j/systemd/merged-usr
snapshot: @TIMESTAMP@
source_subpath: default/stage3-armv6j-systemd-mergedusr-latest.tar.xz
source_subpath: mergedusr/stage3-armv6j-systemd-mergedusr-latest.tar.xz
compression_mode: pixz
update_seed: no
update_seed_command: -uDN @world

4
releases/specs/arm/armv6j/stage3-hardfloat-systemd-mu.spec
View file

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

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

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

4
releases/specs/arm/armv7a/stage1-hardfloat-systemd-mu.spec
View file

@ -1,10 +1,10 @@
subarch: armv7a_hardfp
version_stamp: systemd-mergedusr-@TIMESTAMP@
target: stage1
rel_type: default
rel_type: mergedusr
profile: default/linux/arm/17.0/armv7a/systemd/merged-usr
snapshot: @TIMESTAMP@
source_subpath: default/stage3-armv7a_hardfp-systemd-mergedusr-latest.tar.xz
source_subpath: mergedusr/stage3-armv7a_hardfp-systemd-mergedusr-latest.tar.xz
compression_mode: pixz
update_seed: no
update_seed_command: -uDN @world

4
releases/specs/arm/armv7a/stage1-systemd-mu.spec
View file

@ -1,10 +1,10 @@
subarch: armv7a
version_stamp: systemd-mergedusr-@TIMESTAMP@
target: stage1
rel_type: default
rel_type: mergedusr
profile: default/linux/arm/17.0/armv7a/systemd/merged-usr
snapshot: @TIMESTAMP@
source_subpath: default/stage3-armv7a-systemd-mergedusr-latest.tar.xz
source_subpath: mergedusr/stage3-armv7a-systemd-mergedusr-latest.tar.xz
compression_mode: pixz
update_seed: no
update_seed_command: -uDN @world

4
releases/specs/arm/armv7a/stage3-hardfloat-systemd-mu.spec
View file

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

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

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

42
tools/catalyst-auto-arm.conf
View file

@ -68,7 +68,7 @@ SET_armv7a_sf_systemd_mu_SPECS="armv7a/stage1-systemd-mu.spec armv7a/stage3-syst
update_symlinks() {
# Symlink the latest stages3 to build from
local d f
for d in "${BUILD_SRCDIR_BASE}/builds/default" "${BUILD_SRCDIR_BASE}/builds/musl" "${BUILD_SRCDIR_BASE}/builds/musl-hardened" ; do
for d in "${BUILD_SRCDIR_BASE}/builds/default" "${BUILD_SRCDIR_BASE}/builds/musl" "${BUILD_SRCDIR_BASE}/builds/musl-hardened" "${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
@ -91,57 +91,61 @@ post_build() {
armv4tl/stage3-systemd.spec)
upload stage3-armv4tl-systemd-${TIMESTAMP}*.xz*
;;
armv4tl/stage3-systemd-mu.spec)
upload stage3-armv4tl-systemd-mergedusr-${TIMESTAMP}*.xz*
;;
armv5tel/stage3-openrc.spec)
upload stage3-armv5tel-openrc-${TIMESTAMP}*.xz*
;;
armv5tel/stage3-systemd.spec)
upload stage3-armv5tel-systemd-${TIMESTAMP}*.xz*
;;
armv5tel/stage3-systemd-mu.spec)
upload stage3-armv5tel-systemd-mergedusr-${TIMESTAMP}*.xz*
;;
armv6j/stage3-openrc.spec)
upload stage3-armv6j-openrc-${TIMESTAMP}*.xz*
;;
armv6j/stage3-systemd.spec)
upload stage3-armv6j-systemd-${TIMESTAMP}*.xz*
;;
armv6j/stage3-systemd-mu.spec)
upload stage3-armv6j-systemd-mergedusr-${TIMESTAMP}*.xz*
;;
armv6j/stage3-hardfloat-openrc.spec)
upload stage3-armv6j_hardfp-openrc-${TIMESTAMP}*.xz*
;;
armv6j/stage3-hardfloat-systemd.spec)
upload stage3-armv6j_hardfp-systemd-${TIMESTAMP}*.xz*
;;
armv6j/stage3-hardfloat-systemd-mu.spec)
upload stage3-armv6j_hardfp-systemd-mergedusr-${TIMESTAMP}*.xz*
;;
armv7a/stage3-openrc.spec)
upload stage3-armv7a-openrc-${TIMESTAMP}*.xz*
;;
armv7a/stage3-systemd.spec)
upload stage3-armv7a-systemd-${TIMESTAMP}*.xz*
;;
armv7a/stage3-systemd-mu.spec)
upload stage3-armv7a-systemd-mergedusr-${TIMESTAMP}*.xz*
;;
armv7a/stage3-hardfloat-openrc.spec)
upload stage3-armv7a_hardfp-openrc-${TIMESTAMP}*.xz*
;;
armv7a/stage3-hardfloat-systemd.spec)
upload stage3-armv7a_hardfp-systemd-${TIMESTAMP}*.xz*
;;
esac
popd >/dev/null
pushd "${BUILD_SRCDIR_BASE}/builds/mergedusr" >/dev/null
case ${spec} in
armv4tl/stage3-systemd-mu.spec)
upload stage3-armv4tl-systemd-mergedusr-${TIMESTAMP}*.xz*
;;
armv5tel/stage3-systemd-mu.spec)
upload stage3-armv5tel-systemd-mergedusr-${TIMESTAMP}*.xz*
;;
armv6j/stage3-systemd-mu.spec)
upload stage3-armv6j-systemd-mergedusr-${TIMESTAMP}*.xz*
;;
armv6j/stage3-hardfloat-systemd-mu.spec)
upload stage3-armv6j_hardfp-systemd-mergedusr-${TIMESTAMP}*.xz*
;;
armv7a/stage3-systemd-mu.spec)
upload stage3-armv7a-systemd-mergedusr-${TIMESTAMP}*.xz*
;;
armv7a/stage3-hardfloat-systemd-mu.spec)
upload stage3-armv7a_hardfp-systemd-mergedusr-${TIMESTAMP}*.xz*
;;
*)
echo "Finished ${spec}"
;;
esac
popd >/dev/null