commit: a08b60f67659b020a68b2e6e5a1dcf5136dd66e2
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 22 20:40:25 2024 +0000
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Fri Mar 22 20:40:25 2024 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=a08b60f6
Upload 23.0 stages for arm64
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
tools/catalyst-auto-arm64.conf | 50 ++++++++++++++++++------------------------
1 file changed, 21 insertions(+), 29 deletions(-)
diff --git a/tools/catalyst-auto-arm64.conf b/tools/catalyst-auto-arm64.conf
index 5d2d1268..b2f01a4a 100644
--- a/tools/catalyst-auto-arm64.conf
+++ b/tools/catalyst-auto-arm64.conf
@@ -16,9 +16,7 @@ SETS="
musl_hardened_23
musl_llvm_23
openrc
- systemd_mu
llvm_openrc
- llvm_systemd_mu
musl
musl_hardened
musl_llvm
@@ -27,8 +25,6 @@ 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_systemd_mu_SPECS="stage1-systemd-mu.spec stage3-systemd-mu.spec
stage3d-systemd-mu.spec"
-
SET_openrc_23_SPECS="stage1-openrc-23.spec stage3-openrc-23.spec
stage3d-openrc-23.spec"
SET_openrc_23_su_SPECS="stage1-openrc-23-su.spec stage3-openrc-23-su.spec"
@@ -37,8 +33,6 @@ SET_systemd_23_SPECS="stage1-systemd-23.spec
stage3-systemd-23.spec stage3d-syst
SET_llvm_openrc_SPECS="llvm/stage1-openrc.spec llvm/stage3-openrc.spec"
-SET_llvm_systemd_mu_SPECS="llvm/stage1-systemd-mu.spec
llvm/stage3-systemd-mu.spec"
-
SET_llvm_openrc_23_SPECS="llvm/stage1-openrc-23.spec
llvm/stage3-openrc-23.spec"
SET_llvm_systemd_23_SPECS="llvm/stage1-systemd-23.spec
llvm/stage3-systemd-23.spec"
@@ -82,23 +76,26 @@ post_build() {
installcd-stage2-minimal.spec)
upload install-arm64-*${TIMESTAMP}*.iso*
;;
- stage3-openrc.spec)
+ esac
+ popd >/dev/null
+
+ pushd "${BUILD_SRCDIR_BASE}/builds/23.0-default" >/dev/null
+ case ${spec} in
+ stage3-openrc-23.spec)
upload stage3-${SUBARCH}-openrc-${TIMESTAMP}*.xz*
# do not upsync_binpackages, done by extra builder
;;
- stage3d-openrc.spec)
+ stage3d-openrc-23.spec)
upload stage3-${SUBARCH}-desktop-openrc-${TIMESTAMP}*.xz*
+ # do not upsync_binpackages, done by extra builder
;;
- esac
- popd >/dev/null
-
- pushd "${BUILD_SRCDIR_BASE}/builds/mergedusr" >/dev/null
- case ${spec} in
- stage3-systemd-mu.spec)
- upload stage3-${SUBARCH}-systemd-mergedusr-${TIMESTAMP}*.xz*
+ stage3-systemd-23.spec)
+ upload stage3-${SUBARCH}-systemd-${TIMESTAMP}*.xz*
+ # do not upsync_binpackages, done by extra builder
;;
- stage3d-systemd-mu.spec)
- upload
stage3-${SUBARCH}-desktop-systemd-mergedusr-${TIMESTAMP}*.xz*
+ stage3d-systemd-23.spec)
+ upload stage3-${SUBARCH}-desktop-systemd-${TIMESTAMP}*.xz*
+ # do not upsync_binpackages, done by extra builder
;;
esac
popd >/dev/null
@@ -106,7 +103,6 @@ post_build() {
pushd "${BUILD_SRCDIR_BASE}/builds/llvm" >/dev/null
case ${spec} in
llvm/stage3-openrc.spec)
- upload stage3-${SUBARCH}-llvm-openrc-${TIMESTAMP}*.xz*
upsync_binpackages
"${BUILD_SRCDIR_BASE}/packages/llvm/stage3-arm64" arm64/17.0/arm64_llvm
;;
esac
@@ -114,24 +110,19 @@ post_build() {
pushd "${BUILD_SRCDIR_BASE}/builds/23.0-llvm" >/dev/null
case ${spec} in
+ llvm/stage3-openrc-23.spec)
+ upload stage3-${SUBARCH}-llvm-openrc-${TIMESTAMP}*.xz*
+ ;;
llvm/stage3-systemd-23.spec)
+ upload stage3-${SUBARCH}-llvm-systemd-${TIMESTAMP}*.xz*
upsync_binpackages
"${BUILD_SRCDIR_BASE}/packages/23.0-llvm/stage3-arm64" arm64/23.0/arm64_llvm
;;
esac
popd >/dev/null
- pushd "${BUILD_SRCDIR_BASE}/builds/llvm-mergedusr" >/dev/null
- case ${spec} in
- llvm/stage3-systemd-mu.spec)
- upload
stage3-${SUBARCH}-llvm-systemd-mergedusr-${TIMESTAMP}*.xz*
- ;;
- esac
- popd >/dev/null
-
pushd "${BUILD_SRCDIR_BASE}/builds/musl" >/dev/null
case ${spec} in
musl/stage3.spec)
- upload stage3-${SUBARCH}-*${TIMESTAMP}*.tar.xz*
upsync_binpackages
"${BUILD_SRCDIR_BASE}/packages/musl/stage3-arm64" arm64/17.0/arm64_musl
;;
esac
@@ -140,6 +131,7 @@ post_build() {
pushd "${BUILD_SRCDIR_BASE}/builds/23.0-musl" >/dev/null
case ${spec} in
musl/stage3-23.spec)
+ upload stage3-${SUBARCH}-*${TIMESTAMP}*.tar.xz*
upsync_binpackages
"${BUILD_SRCDIR_BASE}/packages/23.0-musl/stage3-arm64" arm64/23.0/arm64_musl
;;
esac
@@ -148,7 +140,6 @@ post_build() {
pushd "${BUILD_SRCDIR_BASE}/builds/musl-hardened" >/dev/null
case ${spec} in
musl-hardened/stage3.spec)
- upload stage3-${SUBARCH}-*${TIMESTAMP}*.tar.xz*
upsync_binpackages
"${BUILD_SRCDIR_BASE}/packages/musl-hardened/stage3-arm64"
arm64/17.0/arm64_musl_hardened
;;
esac
@@ -157,6 +148,7 @@ post_build() {
pushd "${BUILD_SRCDIR_BASE}/builds/23.0-musl-hardened" >/dev/null
case ${spec} in
musl-hardened/stage3-23.spec)
+ upload stage3-${SUBARCH}-*${TIMESTAMP}*.tar.xz*
upsync_binpackages
"${BUILD_SRCDIR_BASE}/packages/23.0-musl-hardened/stage3-arm64"
arm64/23.0/arm64_musl_hardened
;;
esac
@@ -165,7 +157,6 @@ post_build() {
pushd "${BUILD_SRCDIR_BASE}/builds/musl-llvm" >/dev/null
case ${spec} in
musl-llvm/stage3.spec)
- upload stage3-${SUBARCH}-*${TIMESTAMP}*.tar.xz*
upsync_binpackages
"${BUILD_SRCDIR_BASE}/packages/musl-llvm/stage3-arm64"
arm64/17.0/arm64_musl_llvm
;;
esac
@@ -174,6 +165,7 @@ post_build() {
pushd "${BUILD_SRCDIR_BASE}/builds/23.0-musl-llvm" >/dev/null
case ${spec} in
musl-llvm/stage3-23.spec)
+ upload stage3-${SUBARCH}-*${TIMESTAMP}*.tar.xz*
upsync_binpackages
"${BUILD_SRCDIR_BASE}/packages/23.0-musl-llvm/stage3-arm64"
arm64/23.0/arm64_musl_llvm
;;
esac
