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

Switch arm64 bootmedia uploads to 23.0

Browse source 
Signed-off-by: Andreas K. Hüttel <dilfridge@gentoo.org>
This commit is contained in:
Andreas K. Hüttel 2024-04-01 22:46:37 +02:00
parent a917becf06
commit 69b60ed89e
No known key found for this signature in database
GPG key ID: DC2B16215ED5412A
3 changed files with 32 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
releases/specs/arm64/installcd-stage1.spec
View file

@ -1,10 +1,10 @@
subarch: arm64 subarch: arm64
target: livecd-stage1 target: livecd-stage1
version_stamp: @TIMESTAMP@ version_stamp: @TIMESTAMP@
rel_type: default rel_type: 23.0-default
profile: default/linux/arm64/17.0 profile: default/linux/arm64/23.0
snapshot_treeish: @TREEISH@ snapshot_treeish: @TREEISH@
source_subpath: default/stage3-arm64-openrc-@TIMESTAMP@.tar.xz source_subpath: 23.0-default/stage3-arm64-openrc-@TIMESTAMP@.tar.xz
compression_mode: pixz compression_mode: pixz
portage_confdir: @REPO_DIR@/releases/portage/isos portage_confdir: @REPO_DIR@/releases/portage/isos

50
releases/specs/arm64/installcd-stage2-minimal.spec
View file

@ -1,10 +1,10 @@
subarch: arm64 subarch: arm64
version_stamp: @TIMESTAMP@ version_stamp: @TIMESTAMP@
target: livecd-stage2 target: livecd-stage2
rel_type: default rel_type: 23.0-default
profile: default/linux/arm64/17.0 profile: default/linux/arm64/23.0
snapshot_treeish: @TREEISH@ snapshot_treeish: @TREEISH@
source_subpath: default/livecd-stage1-arm64-@TIMESTAMP@.tar.xz source_subpath: 23.0-default/livecd-stage1-arm64-@TIMESTAMP@.tar.xz
portage_confdir: @REPO_DIR@/releases/portage/isos portage_confdir: @REPO_DIR@/releases/portage/isos
livecd/bootargs: dokeymap livecd/bootargs: dokeymap
@ -75,10 +75,10 @@ livecd/empty:
/etc/rsync /etc/rsync
/etc/runlevels/single /etc/runlevels/single
/etc/skel /etc/skel
/lib/dev-state /usr/lib/dev-state
/lib/udev-state /usr/lib/udev-state
/lib64/dev-state /usr/lib64/dev-state
/lib64/udev-state /usr/lib64/udev-state
/root/.ccache /root/.ccache
/tmp /tmp
/usr/diet/include /usr/diet/include
@ -158,17 +158,17 @@ livecd/rm:
/etc/make.profile /etc/make.profile
/etc/man.conf /etc/man.conf
/etc/resolv.conf /etc/resolv.conf
/lib*/*.a /usr/lib*/*.a
/lib*/*.la /usr/lib*/*.la
/lib*/cpp /usr/lib*/cpp
/root/.bash_history /root/.bash_history
/root/.viminfo /root/.viminfo
/sbin/*.static /usr/bin/*.static
/sbin/fsck.cramfs /usr/bin/fsck.cramfs
/sbin/fsck.minix /usr/bin/fsck.minix
/sbin/mkfs.bfs /usr/bin/mkfs.bfs
/sbin/mkfs.cramfs /usr/bin/mkfs.cramfs
/sbin/mkfs.minix /usr/bin/mkfs.minix
/usr/bin/addr2line /usr/bin/addr2line
/usr/bin/ar /usr/bin/ar
/usr/bin/as /usr/bin/as
@ -210,15 +210,15 @@ livecd/rm:
/usr/lib*/*.la /usr/lib*/*.la
/usr/lib*/perl5/site_perl /usr/lib*/perl5/site_perl
/usr/lib*/gcc-lib/*/*/libgcj* /usr/lib*/gcc-lib/*/*/libgcj*
/usr/sbin/archive-conf /usr/bin/archive-conf
/usr/sbin/dispatch-conf /usr/bin/dispatch-conf
/usr/sbin/emaint /usr/bin/emaint
/usr/sbin/env-update /usr/bin/env-update
/usr/sbin/etc-update /usr/bin/etc-update
/usr/sbin/fb* /usr/bin/fb*
/usr/sbin/fixpackages /usr/bin/fixpackages
/usr/sbin/quickpkg /usr/bin/quickpkg
/usr/sbin/regenworld /usr/bin/regenworld
/usr/share/consolefonts/1* /usr/share/consolefonts/1*
/usr/share/consolefonts/7* /usr/share/consolefonts/7*
/usr/share/consolefonts/8* /usr/share/consolefonts/8*

13
tools/catalyst-auto-arm64.conf
View file

@ -23,9 +23,9 @@ SETS="
" "
SET_openrc_SPECS="stage1-openrc.spec stage3-openrc.spec stage3d-openrc.spec" SET_openrc_SPECS="stage1-openrc.spec stage3-openrc.spec stage3d-openrc.spec"
SET_openrc_OPTIONAL_SPECS="installcd-stage1.spec installcd-stage2-minimal.spec"
SET_openrc_23_SPECS="stage1-openrc-23.spec stage3-openrc-23.spec stage3d-openrc-23.spec" SET_openrc_23_SPECS="stage1-openrc-23.spec stage3-openrc-23.spec stage3d-openrc-23.spec"
SET_openrc_23_OPTIONAL_SPECS="installcd-stage1.spec installcd-stage2-minimal.spec"
SET_openrc_23_su_SPECS="stage1-openrc-23-su.spec stage3-openrc-23-su.spec" SET_openrc_23_su_SPECS="stage1-openrc-23-su.spec stage3-openrc-23-su.spec"
@ -71,14 +71,6 @@ update_symlinks() {
post_build() { post_build() {
local set=$1 spec=$2 local set=$1 spec=$2
pushd "${BUILD_SRCDIR_BASE}/builds/default" >/dev/null
case ${spec} in
installcd-stage2-minimal.spec)
upload install-arm64-*${TIMESTAMP}*.iso*
;;
esac
popd >/dev/null
pushd "${BUILD_SRCDIR_BASE}/builds/23.0-default" >/dev/null pushd "${BUILD_SRCDIR_BASE}/builds/23.0-default" >/dev/null
case ${spec} in case ${spec} in
stage3-openrc-23.spec) stage3-openrc-23.spec)
@ -97,6 +89,9 @@ post_build() {
upload stage3-${SUBARCH}-desktop-systemd-${TIMESTAMP}*.xz* upload stage3-${SUBARCH}-desktop-systemd-${TIMESTAMP}*.xz*
# do not upsync_binpackages, done by extra builder # do not upsync_binpackages, done by extra builder
;; ;;
installcd-stage2-minimal.spec)
upload install-arm64-*${TIMESTAMP}*.iso*
;;
esac esac
popd >/dev/null popd >/dev/null