commit: 69b60ed89e8f9e2bd24c9ab715ca9ba9c83927d1 Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org> AuthorDate: Mon Apr 1 20:46:37 2024 +0000 Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org> CommitDate: Mon Apr 1 20:46:37 2024 +0000 URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=69b60ed8
Switch arm64 bootmedia uploads to 23.0 Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org> releases/specs/arm64/installcd-stage1.spec | 6 +-- releases/specs/arm64/installcd-stage2-minimal.spec | 50 +++++++++++----------- tools/catalyst-auto-arm64.conf | 13 ++---- 3 files changed, 32 insertions(+), 37 deletions(-) diff --git a/releases/specs/arm64/installcd-stage1.spec b/releases/specs/arm64/installcd-stage1.spec index b6809046..7506ef20 100644 --- a/releases/specs/arm64/installcd-stage1.spec +++ b/releases/specs/arm64/installcd-stage1.spec @@ -1,10 +1,10 @@ subarch: arm64 target: livecd-stage1 version_stamp: @TIMESTAMP@ -rel_type: default -profile: default/linux/arm64/17.0 +rel_type: 23.0-default +profile: default/linux/arm64/23.0 snapshot_treeish: @TREEISH@ -source_subpath: default/stage3-arm64-openrc-@[email protected] +source_subpath: 23.0-default/stage3-arm64-openrc-@[email protected] compression_mode: pixz portage_confdir: @REPO_DIR@/releases/portage/isos diff --git a/releases/specs/arm64/installcd-stage2-minimal.spec b/releases/specs/arm64/installcd-stage2-minimal.spec index 7d3a7b4a..f55be2fe 100644 --- a/releases/specs/arm64/installcd-stage2-minimal.spec +++ b/releases/specs/arm64/installcd-stage2-minimal.spec @@ -1,10 +1,10 @@ subarch: arm64 version_stamp: @TIMESTAMP@ target: livecd-stage2 -rel_type: default -profile: default/linux/arm64/17.0 +rel_type: 23.0-default +profile: default/linux/arm64/23.0 snapshot_treeish: @TREEISH@ -source_subpath: default/livecd-stage1-arm64-@[email protected] +source_subpath: 23.0-default/livecd-stage1-arm64-@[email protected] portage_confdir: @REPO_DIR@/releases/portage/isos livecd/bootargs: dokeymap @@ -75,10 +75,10 @@ livecd/empty: /etc/rsync /etc/runlevels/single /etc/skel - /lib/dev-state - /lib/udev-state - /lib64/dev-state - /lib64/udev-state + /usr/lib/dev-state + /usr/lib/udev-state + /usr/lib64/dev-state + /usr/lib64/udev-state /root/.ccache /tmp /usr/diet/include @@ -158,17 +158,17 @@ livecd/rm: /etc/make.profile /etc/man.conf /etc/resolv.conf - /lib*/*.a - /lib*/*.la - /lib*/cpp + /usr/lib*/*.a + /usr/lib*/*.la + /usr/lib*/cpp /root/.bash_history /root/.viminfo - /sbin/*.static - /sbin/fsck.cramfs - /sbin/fsck.minix - /sbin/mkfs.bfs - /sbin/mkfs.cramfs - /sbin/mkfs.minix + /usr/bin/*.static + /usr/bin/fsck.cramfs + /usr/bin/fsck.minix + /usr/bin/mkfs.bfs + /usr/bin/mkfs.cramfs + /usr/bin/mkfs.minix /usr/bin/addr2line /usr/bin/ar /usr/bin/as @@ -210,15 +210,15 @@ livecd/rm: /usr/lib*/*.la /usr/lib*/perl5/site_perl /usr/lib*/gcc-lib/*/*/libgcj* - /usr/sbin/archive-conf - /usr/sbin/dispatch-conf - /usr/sbin/emaint - /usr/sbin/env-update - /usr/sbin/etc-update - /usr/sbin/fb* - /usr/sbin/fixpackages - /usr/sbin/quickpkg - /usr/sbin/regenworld + /usr/bin/archive-conf + /usr/bin/dispatch-conf + /usr/bin/emaint + /usr/bin/env-update + /usr/bin/etc-update + /usr/bin/fb* + /usr/bin/fixpackages + /usr/bin/quickpkg + /usr/bin/regenworld /usr/share/consolefonts/1* /usr/share/consolefonts/7* /usr/share/consolefonts/8* diff --git a/tools/catalyst-auto-arm64.conf b/tools/catalyst-auto-arm64.conf index dc572bab..28e51b4b 100644 --- a/tools/catalyst-auto-arm64.conf +++ b/tools/catalyst-auto-arm64.conf @@ -23,9 +23,9 @@ SETS=" " 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_OPTIONAL_SPECS="installcd-stage1.spec installcd-stage2-minimal.spec" SET_openrc_23_su_SPECS="stage1-openrc-23-su.spec stage3-openrc-23-su.spec" @@ -71,14 +71,6 @@ update_symlinks() { post_build() { 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 case ${spec} in stage3-openrc-23.spec) @@ -97,6 +89,9 @@ post_build() { upload stage3-${SUBARCH}-desktop-systemd-${TIMESTAMP}*.xz* # do not upsync_binpackages, done by extra builder ;; + installcd-stage2-minimal.spec) + upload install-arm64-*${TIMESTAMP}*.iso* + ;; esac popd >/dev/null
