commit: 5e3b3b971f7442c6b226b6ae9bc41a4f09fde8f4
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 23 14:21:03 2024 +0000
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sat Mar 23 14:21:03 2024 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=5e3b3b97
Upload 23.0 stages for x86
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
tools/catalyst-auto-x86.conf | 31 ++++++++++---------------------
1 file changed, 10 insertions(+), 21 deletions(-)
diff --git a/tools/catalyst-auto-x86.conf b/tools/catalyst-auto-x86.conf
index 279d5e83..fd16762a 100644
--- a/tools/catalyst-auto-x86.conf
+++ b/tools/catalyst-auto-x86.conf
@@ -17,9 +17,7 @@ SETS="
hardened_openrc_23
musl_23
i486_openrc
- i486_systemd_mu
i686_openrc
- i686_systemd_mu
hardened_openrc
musl
"
@@ -29,16 +27,12 @@
SET_i486_openrc_OPTIONAL_SPECS="i486/installcd-stage1-openrc.spec i486/installcd
SET_i486_openrc_23_SPECS="i486/stage1-openrc-23.spec
i486/stage3-openrc-23.spec"
-SET_i486_systemd_mu_SPECS="i486/stage1-systemd-mu.spec
i486/stage3-systemd-mu.spec"
-
SET_i486_systemd_23_SPECS="i486/stage1-systemd-23.spec
i486/stage3-systemd-23.spec"
SET_i686_openrc_SPECS="i686/stage1-openrc.spec i686/stage3-openrc.spec"
SET_i686_openrc_23_SPECS="i686/stage1-openrc-23.spec
i686/stage3-openrc-23.spec"
-SET_i686_systemd_mu_SPECS="i686/stage1-systemd-mu.spec
i686/stage3-systemd-mu.spec"
-
SET_i686_systemd_23_SPECS="i686/stage1-systemd-23.spec
i686/stage3-systemd-23.spec"
SET_hardened_openrc_SPECS="hardened/stage1-openrc.spec
hardened/stage3-openrc.spec"
@@ -84,14 +78,12 @@ post_build() {
pushd ${BUILD_SRCDIR_BASE}/builds/default >/dev/null || exit
case ${spec} in
i486/stage3-openrc.spec)
- upload stage3-i486-openrc-${TIMESTAMP}.tar.xz*
upsync_binpackages
"${BUILD_SRCDIR_BASE}/packages/default/stage3-i486" x86/17.0/i486
;;
i486/installcd-stage2-minimal-openrc.spec)
upload install-x86-minimal-${TIMESTAMP}.iso*
;;
i686/stage3-openrc.spec)
- upload stage3-i686-openrc-${TIMESTAMP}.tar.xz*
upsync_binpackages
"${BUILD_SRCDIR_BASE}/packages/default/stage3-i686" x86/17.0/i686
;;
esac
@@ -99,30 +91,26 @@ post_build() {
pushd ${BUILD_SRCDIR_BASE}/builds/23.0-default >/dev/null || exit
case ${spec} in
+ i486/stage3-openrc-23.spec)
+ upload stage3-i486-openrc-${TIMESTAMP}.tar.xz*
+ ;;
i486/stage3-systemd-23.spec)
+ upload stage3-i486-systemd-${TIMESTAMP}.tar.xz*
upsync_binpackages
"${BUILD_SRCDIR_BASE}/packages/23.0-default/stage3-i486" x86/23.0/i486
;;
+ i686/stage3-openrc-23.spec)
+ upload stage3-i686-openrc-${TIMESTAMP}.tar.xz*
+ ;;
i686/stage3-systemd-23.spec)
+ upload stage3-i686-systemd-${TIMESTAMP}.tar.xz*
upsync_binpackages
"${BUILD_SRCDIR_BASE}/packages/23.0-default/stage3-i686" x86/23.0/i686
;;
esac
popd >/dev/null || exit
- pushd ${BUILD_SRCDIR_BASE}/builds/mergedusr >/dev/null || exit
- case ${spec} in
- i486/stage3-systemd-mu.spec)
- upload stage3-i486-systemd-mergedusr-${TIMESTAMP}.tar.xz*
- ;;
- i686/stage3-systemd-mu.spec)
- upload stage3-i686-systemd-mergedusr-${TIMESTAMP}.tar.xz*
- ;;
- esac
- popd >/dev/null || exit
-
pushd ${BUILD_SRCDIR_BASE}/builds/hardened >/dev/null || exit
case ${spec} in
hardened/stage3-openrc.spec)
- upload stage3-i686-hardened-openrc-${TIMESTAMP}.tar.xz*
upsync_binpackages
"${BUILD_SRCDIR_BASE}/packages/hardened/stage3-i686" x86/17.0/i686_hardened
;;
hardened/admincd-stage2-openrc.spec)
@@ -134,6 +122,7 @@ post_build() {
pushd ${BUILD_SRCDIR_BASE}/builds/23.0-hardened >/dev/null || exit
case ${spec} in
hardened/stage3-openrc-23.spec)
+ upload stage3-i686-hardened-openrc-${TIMESTAMP}.tar.xz*
upsync_binpackages
"${BUILD_SRCDIR_BASE}/packages/23.0-hardened/stage3-i686" x86/23.0/i686_hardened
;;
esac
@@ -142,7 +131,6 @@ post_build() {
pushd ${BUILD_SRCDIR_BASE}/builds/musl >/dev/null || exit
case ${spec} in
musl/stage3.spec)
- upload stage3-i686-musl-${TIMESTAMP}.tar.xz*
upsync_binpackages
"${BUILD_SRCDIR_BASE}/packages/musl/stage3-i686" x86/17.0/i686_musl
;;
esac
@@ -151,6 +139,7 @@ post_build() {
pushd ${BUILD_SRCDIR_BASE}/builds/23.0-musl >/dev/null || exit
case ${spec} in
musl/stage3-23.spec)
+ upload stage3-i686-musl-${TIMESTAMP}.tar.xz*
upsync_binpackages
"${BUILD_SRCDIR_BASE}/packages/23.0-musl/stage3-i686" x86/23.0/i686_musl
;;
esac
