commit: d7d6f5a75f3a1cdc868065e6bf618391a2f87c3b
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Sat Jun 1 15:48:16 2024 +0000
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sat Jun 1 15:48:16 2024 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=d7d6f5a7
Clean up catalyst-auto configurations
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
tools/catalyst-auto-amd64.conf | 73 -------------------------
tools/catalyst-auto-arm.conf | 69 ------------------------
tools/catalyst-auto-arm64.conf | 42 ---------------
tools/catalyst-auto-hppa.conf | 15 ------
tools/catalyst-auto-ia64.conf | 5 --
tools/catalyst-auto-ppc.conf | 20 -------
tools/catalyst-auto-ppc64le.conf | 21 --------
tools/catalyst-auto-qemu-alpha.conf | 10 ----
tools/catalyst-auto-qemu-arm64.conf | 10 ----
tools/catalyst-auto-qemu-loong.conf | 10 ----
tools/catalyst-auto-qemu-m68k.conf | 14 -----
tools/catalyst-auto-qemu-mips-common | 102 -----------------------------------
tools/catalyst-auto-qemu-riscv.conf | 17 ------
tools/catalyst-auto-s390x.conf | 15 ------
tools/catalyst-auto-sparc64.conf | 15 ------
tools/catalyst-auto-x86.conf | 35 ------------
16 files changed, 473 deletions(-)
diff --git a/tools/catalyst-auto-amd64.conf b/tools/catalyst-auto-amd64.conf
index 788f0f1b..da417c16 100644
--- a/tools/catalyst-auto-amd64.conf
+++ b/tools/catalyst-auto-amd64.conf
@@ -29,31 +29,6 @@ SETS="
x32_systemd_23
"
-# 17.0
-
-SET_openrc_SPECS="stage1-openrc.spec stage3-openrc.spec"
-SET_openrc_OPTIONAL_SPECS="stage3d-openrc.spec"
-
-SET_hardened_openrc_SPECS="hardened/stage1-openrc.spec
hardened/stage3-openrc.spec"
-
-SET_hardened_selinux_openrc_SPECS="hardened-selinux/stage1-openrc.spec
hardened-selinux/stage3-openrc.spec"
-
-SET_hardened_nomultilib_selinux_openrc_SPECS="hardened-nomultilib-selinux/stage1-openrc.spec
hardened-nomultilib-selinux/stage3-openrc.spec"
-
-SET_hardened_nomultilib_openrc_SPECS="hardened-nomultilib/stage1-openrc.spec
hardened-nomultilib/stage3-openrc.spec"
-
-SET_nomultilib_openrc_SPECS="nomultilib/stage1-openrc.spec
nomultilib/stage3-openrc.spec"
-
-SET_llvm_openrc_SPECS="clang/stage1-openrc.spec clang/stage3-openrc.spec"
-
-SET_musl_SPECS="musl/stage1.spec musl/stage3.spec"
-
-SET_musl_llvm_SPECS="musl-clang/stage1.spec musl-clang/stage3.spec"
-
-SET_musl_hardened_SPECS="musl-hardened/stage1.spec musl-hardened/stage3.spec"
-
-SET_x32_openrc_SPECS="x32/stage1-openrc.spec x32/stage3-openrc.spec"
-
# 23.0
SET_openrc_23_SPECS="stage1-openrc-23.spec stage3-openrc-23.spec"
@@ -124,14 +99,6 @@ update_symlinks() {
post_build() {
local set=$1 spec=$2
- pushd "${BUILD_SRCDIR_BASE}"/builds/default >/dev/null || exit
- case ${spec} in
- x32/stage3-openrc.spec)
- upsync_binpackages
"${BUILD_SRCDIR_BASE}/packages/default/stage3-x32" amd64/17.0/x32
- ;;
- esac
- popd >/dev/null || exit
-
pushd "${BUILD_SRCDIR_BASE}"/builds/23.0-default >/dev/null || exit
case ${spec} in
stage3-openrc-23.spec)
@@ -181,14 +148,6 @@ post_build() {
esac
popd >/dev/null || exit
- pushd "${BUILD_SRCDIR_BASE}"/builds/clang >/dev/null || exit
- case ${spec} in
- clang/stage3-openrc.spec)
- upsync_binpackages
"${BUILD_SRCDIR_BASE}/packages/clang/stage3-amd64" amd64/17.1/x86-64_llvm
- ;;
- esac
- popd >/dev/null || exit
-
pushd "${BUILD_SRCDIR_BASE}"/builds/23.0-llvm >/dev/null || exit
case ${spec} in
llvm/stage3-openrc-23.spec)
@@ -201,14 +160,6 @@ post_build() {
esac
popd >/dev/null || exit
- pushd "${BUILD_SRCDIR_BASE}"/builds/hardened >/dev/null || exit
- case ${spec} in
- hardened/stage3-openrc.spec)
- upsync_binpackages
"${BUILD_SRCDIR_BASE}/packages/hardened/stage3-amd64" amd64/17.1/x86-64_hardened
- ;;
- esac
- popd >/dev/null || exit
-
pushd "${BUILD_SRCDIR_BASE}"/builds/23.0-hardened >/dev/null || exit
case ${spec} in
hardened/stage3-openrc-23.spec)
@@ -236,14 +187,6 @@ post_build() {
esac
popd >/dev/null || exit
- pushd "${BUILD_SRCDIR_BASE}"/builds/musl >/dev/null || exit
- case ${spec} in
- musl/stage3.spec)
- upsync_binpackages
"${BUILD_SRCDIR_BASE}/packages/musl/stage3-amd64" amd64/17.1/x86-64_musl
- ;;
- esac
- popd >/dev/null || exit
-
pushd "${BUILD_SRCDIR_BASE}"/builds/23.0-musl >/dev/null || exit
case ${spec} in
musl/stage3-23.spec)
@@ -253,14 +196,6 @@ post_build() {
esac
popd >/dev/null || exit
- pushd "${BUILD_SRCDIR_BASE}"/builds/musl-clang >/dev/null || exit
- case ${spec} in
- musl-clang/stage3.spec)
- upsync_binpackages
"${BUILD_SRCDIR_BASE}/packages/musl-clang/stage3-amd64"
amd64/17.1/x86-64_musl_llvm
- ;;
- esac
- popd >/dev/null || exit
-
pushd "${BUILD_SRCDIR_BASE}"/builds/23.0-musl-llvm >/dev/null || exit
case ${spec} in
musl-llvm/stage3-23.spec)
@@ -270,14 +205,6 @@ post_build() {
esac
popd >/dev/null || exit
- pushd "${BUILD_SRCDIR_BASE}"/builds/musl-hardened >/dev/null || exit
- case ${spec} in
- musl-hardened/stage3.spec)
- upsync_binpackages
"${BUILD_SRCDIR_BASE}/packages/musl-hardened/stage3-amd64"
amd64/17.1/x86-64_musl_hardened
- ;;
- esac
- popd >/dev/null || exit
-
pushd "${BUILD_SRCDIR_BASE}"/builds/23.0-musl-hardened >/dev/null ||
exit
case ${spec} in
musl-hardened/stage3-23.spec)
diff --git a/tools/catalyst-auto-arm.conf b/tools/catalyst-auto-arm.conf
index d530c5ea..b1590fa3 100644
--- a/tools/catalyst-auto-arm.conf
+++ b/tools/catalyst-auto-arm.conf
@@ -29,24 +29,6 @@ SETS="
armv7a_hf_musl_hardened_openrc_23
"
-SET_armv4tl_openrc_SPECS="armv4tl/stage1-openrc.spec
armv4tl/stage3-openrc.spec"
-
-SET_armv5tel_openrc_SPECS="armv5tel/stage1-openrc.spec
armv5tel/stage3-openrc.spec"
-
-SET_armv6j_hf_openrc_SPECS="armv6j/stage1-hardfloat-openrc.spec
armv6j/stage3-hardfloat-openrc.spec"
-
-SET_armv6j_sf_openrc_SPECS="armv6j/stage1-openrc.spec
armv6j/stage3-openrc.spec"
-
-SET_armv6j_hf_musl_openrc_SPECS="armv6j-musl/stage1-hardfloat.spec
armv6j-musl/stage3-hardfloat.spec"
-SET_armv6j_hf_musl_hardened_openrc_SPECS="armv6j-musl-hardened/stage1-hardfloat.spec
armv6j-musl-hardened/stage3-hardfloat.spec"
-
-SET_armv7a_hf_openrc_SPECS="armv7a/stage1-hardfloat-openrc.spec
armv7a/stage3-hardfloat-openrc.spec"
-
-SET_armv7a_hf_musl_openrc_SPECS="armv7a-musl/stage1-hardfloat.spec
armv7a-musl/stage3-hardfloat.spec"
-SET_armv7a_hf_musl_hardened_openrc_SPECS="armv7a-musl-hardened/stage1-hardfloat.spec
armv7a-musl-hardened/stage3-hardfloat.spec"
-
-SET_armv7a_sf_openrc_SPECS="armv7a/stage1-openrc.spec
armv7a/stage3-openrc.spec"
-
SET_armv4tl_openrc_23_SPECS="armv4tl/stage1-openrc-23.spec
armv4tl/stage3-openrc-23.spec"
SET_armv4tl_systemd_23_SPECS="armv4tl/stage1-systemd-23.spec
armv4tl/stage3-systemd-23.spec"
@@ -89,31 +71,6 @@ update_symlinks() {
post_build() {
local set=$1 spec=$2
- pushd "${BUILD_SRCDIR_BASE}/builds/default" >/dev/null
-
- case ${spec} in
- armv4tl/stage3-openrc.spec)
- upsync_binpackages
"${BUILD_SRCDIR_BASE}/packages/default/stage3-armv4tl" arm/17.0/armv4tl
- ;;
- armv5tel/stage3-openrc.spec)
- upsync_binpackages
"${BUILD_SRCDIR_BASE}/packages/default/stage3-armv5tel" arm/17.0/armv5tel
- ;;
- armv6j/stage3-openrc.spec)
- upsync_binpackages
"${BUILD_SRCDIR_BASE}/packages/default/stage3-armv6j" arm/17.0/armv6j
- ;;
- armv6j/stage3-hardfloat-openrc.spec)
- upsync_binpackages
"${BUILD_SRCDIR_BASE}/packages/default/stage3-armv6j_hardfp"
arm/17.0/armv6j_hardfp
- ;;
- armv7a/stage3-openrc.spec)
- upsync_binpackages
"${BUILD_SRCDIR_BASE}/packages/default/stage3-armv7a" arm/17.0/armv7a
- ;;
- armv7a/stage3-hardfloat-openrc.spec)
- upsync_binpackages
"${BUILD_SRCDIR_BASE}/packages/default/stage3-armv7a_hardfp"
arm/17.0/armv7a_hardfp
- ;;
- esac
-
- popd >/dev/null
-
pushd "${BUILD_SRCDIR_BASE}/builds/23.0-default" >/dev/null
case ${spec} in
@@ -163,19 +120,6 @@ post_build() {
popd >/dev/null
- pushd "${BUILD_SRCDIR_BASE}/builds/musl" >/dev/null
-
- case ${spec} in
- armv7a-musl/stage3-hardfloat.spec)
- upsync_binpackages
"${BUILD_SRCDIR_BASE}/packages/musl/stage3-armv7a_hardfp_musl"
arm/17.0/armv7a_hardfp_musl
- ;;
- armv6j-musl/stage3-hardfloat.spec)
- upsync_binpackages
"${BUILD_SRCDIR_BASE}/packages/musl/stage3-armv6j_hardfp_musl"
arm/17.0/armv6j_hardfp_musl
- ;;
- esac
-
- popd >/dev/null
-
pushd "${BUILD_SRCDIR_BASE}/builds/23.0-musl" >/dev/null
case ${spec} in
@@ -191,19 +135,6 @@ post_build() {
popd >/dev/null
- pushd "${BUILD_SRCDIR_BASE}/builds/musl-hardened" >/dev/null
-
- case ${spec} in
- armv7a-musl-hardened/stage3-hardfloat.spec)
- upsync_binpackages
"${BUILD_SRCDIR_BASE}/packages/musl-hardened/stage3-armv7a_hardfp_musl"
arm/17.0/armv7a_hardfp_musl_hardened
- ;;
- armv6j-musl-hardened/stage3-hardfloat.spec)
- upsync_binpackages
"${BUILD_SRCDIR_BASE}/packages/musl-hardened/stage3-armv6j_hardfp_musl"
arm/17.0/armv6j_hardfp_musl_hardened
- ;;
- esac
-
- popd >/dev/null
-
pushd "${BUILD_SRCDIR_BASE}/builds/23.0-musl-hardened" >/dev/null
case ${spec} in
diff --git a/tools/catalyst-auto-arm64.conf b/tools/catalyst-auto-arm64.conf
index e32763e3..908012d3 100644
--- a/tools/catalyst-auto-arm64.conf
+++ b/tools/catalyst-auto-arm64.conf
@@ -17,8 +17,6 @@ SETS="
musl_llvm_23
"
-SET_openrc_SPECS="stage1-openrc.spec stage3-openrc.spec stage3d-openrc.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"
@@ -26,18 +24,10 @@ SET_openrc_23_su_SPECS="stage1-openrc-23-su.spec
stage3-openrc-23-su.spec"
SET_systemd_23_SPECS="stage1-systemd-23.spec stage3-systemd-23.spec
stage3d-systemd-23.spec"
-SET_llvm_openrc_SPECS="llvm/stage1-openrc.spec llvm/stage3-openrc.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"
-SET_musl_SPECS="musl/stage1.spec musl/stage3.spec"
-
-SET_musl_hardened_SPECS="musl-hardened/stage1.spec musl-hardened/stage3.spec"
-
-SET_musl_llvm_SPECS="musl-llvm/stage1.spec musl-llvm/stage3.spec"
-
SET_musl_23_SPECS="musl/stage1-23.spec musl/stage3-23.spec"
SET_musl_hardened_23_SPECS="musl-hardened/stage1-23.spec
musl-hardened/stage3-23.spec"
@@ -98,14 +88,6 @@ post_build() {
esac
popd >/dev/null
- pushd "${BUILD_SRCDIR_BASE}/builds/llvm" >/dev/null
- case ${spec} in
- llvm/stage3-openrc.spec)
- upsync_binpackages
"${BUILD_SRCDIR_BASE}/packages/llvm/stage3-arm64" arm64/17.0/arm64_llvm
- ;;
- esac
- popd >/dev/null
-
pushd "${BUILD_SRCDIR_BASE}/builds/23.0-llvm" >/dev/null
case ${spec} in
llvm/stage3-openrc-23.spec)
@@ -118,14 +100,6 @@ post_build() {
esac
popd >/dev/null
- pushd "${BUILD_SRCDIR_BASE}/builds/musl" >/dev/null
- case ${spec} in
- musl/stage3.spec)
- upsync_binpackages
"${BUILD_SRCDIR_BASE}/packages/musl/stage3-arm64" arm64/17.0/arm64_musl
- ;;
- esac
- popd >/dev/null
-
pushd "${BUILD_SRCDIR_BASE}/builds/23.0-musl" >/dev/null
case ${spec} in
musl/stage3-23.spec)
@@ -135,14 +109,6 @@ post_build() {
esac
popd >/dev/null
- pushd "${BUILD_SRCDIR_BASE}/builds/musl-hardened" >/dev/null
- case ${spec} in
- musl-hardened/stage3.spec)
- upsync_binpackages
"${BUILD_SRCDIR_BASE}/packages/musl-hardened/stage3-arm64"
arm64/17.0/arm64_musl_hardened
- ;;
- esac
- popd >/dev/null
-
pushd "${BUILD_SRCDIR_BASE}/builds/23.0-musl-hardened" >/dev/null
case ${spec} in
musl-hardened/stage3-23.spec)
@@ -152,14 +118,6 @@ post_build() {
esac
popd >/dev/null
- pushd "${BUILD_SRCDIR_BASE}/builds/musl-llvm" >/dev/null
- case ${spec} in
- musl-llvm/stage3.spec)
- upsync_binpackages
"${BUILD_SRCDIR_BASE}/packages/musl-llvm/stage3-arm64"
arm64/17.0/arm64_musl_llvm
- ;;
- esac
- popd >/dev/null
-
pushd "${BUILD_SRCDIR_BASE}/builds/23.0-musl-llvm" >/dev/null
case ${spec} in
musl-llvm/stage3-23.spec)
diff --git a/tools/catalyst-auto-hppa.conf b/tools/catalyst-auto-hppa.conf
index a040f876..42d73618 100644
--- a/tools/catalyst-auto-hppa.conf
+++ b/tools/catalyst-auto-hppa.conf
@@ -12,10 +12,6 @@ SETS="
hppa20_systemd_23
"
-SET_hppa11_openrc_SPECS="hppa1.1/stage1-openrc.spec hppa1.1/stage3-openrc.spec"
-
-SET_hppa20_openrc_SPECS="hppa2.0/stage1-openrc.spec hppa2.0/stage3-openrc.spec"
-
SET_hppa11_openrc_23_SPECS="hppa1.1/stage1-openrc-23.spec
hppa1.1/stage3-openrc-23.spec"
SET_hppa11_openrc_23_OPTIONAL_SPECS="installcd-stage1.spec
installcd-stage2-minimal.spec netboot-hppa32.spec"
@@ -52,17 +48,6 @@ update_symlinks() {
post_build() {
local set=$1 spec=$2
- pushd "${BUILD_SRCDIR_BASE}/builds/default" >/dev/null
- case ${spec} in
- hppa1.1/stage3-openrc.spec)
- upsync_binpackages
"${BUILD_SRCDIR_BASE}/packages/default/stage3-hppa1.1" hppa/17.0/hppa1.1
- ;;
- hppa2.0/stage3-openrc.spec)
- upsync_binpackages
"${BUILD_SRCDIR_BASE}/packages/default/stage3-hppa2.0" hppa/17.0/hppa2.0
- ;;
- esac
- popd >/dev/null
-
pushd "${BUILD_SRCDIR_BASE}/builds/23.0-default" >/dev/null
case ${spec} in
hppa1.1/stage3-openrc-23.spec)
diff --git a/tools/catalyst-auto-ia64.conf b/tools/catalyst-auto-ia64.conf
index 6527141e..c9f1290a 100644
--- a/tools/catalyst-auto-ia64.conf
+++ b/tools/catalyst-auto-ia64.conf
@@ -10,8 +10,6 @@ SETS="
systemd_23
"
-SET_openrc_SPECS="stage1-openrc.spec stage3-openrc.spec"
-
SET_openrc_23_SPECS="stage1-openrc-23.spec stage3-openrc-23.spec"
SET_openrc_23_OPTIONAL_SPECS="installcd-stage1.spec
installcd-stage2-minimal.spec"
@@ -42,9 +40,6 @@ post_build() {
installcd-stage2*)
upload builds/23.0-default/*${TIMESTAMP}*.iso*
;;
- stage3-openrc.spec)
- upsync_binpackages packages/default/stage3-ia64 ia64/17.0/ia64
- ;;
stage3-openrc-23.spec)
upload
builds/23.0-default/stage3-ia64-openrc-${TIMESTAMP}.tar.xz*
;;
diff --git a/tools/catalyst-auto-ppc.conf b/tools/catalyst-auto-ppc.conf
index b62aaa84..fb671487 100644
--- a/tools/catalyst-auto-ppc.conf
+++ b/tools/catalyst-auto-ppc.conf
@@ -14,14 +14,6 @@ SETS="
musl_hardened_64_23
"
-SET_openrc_SPECS="ppc32/stage1-openrc.spec ppc32/stage3-openrc.spec"
-
-SET_musl_hardened_SPECS="ppc32/stage1-musl-hardened-openrc.spec
ppc32/stage3-musl-hardened-openrc.spec"
-
-SET_openrc_64_SPECS="ppc64/stage1-openrc.spec ppc64/stage3-openrc.spec"
-
-SET_musl_hardened_64_SPECS="ppc64/stage1-musl-hardened-openrc.spec
ppc64/stage3-musl-hardened-openrc.spec"
-
SET_openrc_23_SPECS="ppc32/stage1-openrc-23.spec ppc32/stage3-openrc-23.spec"
SET_openrc_23_OPTIONAL_SPECS="ppc32/installcd-stage1.spec
ppc32/installcd-stage2-minimal.spec"
@@ -64,18 +56,6 @@ post_build() {
pushd "${BUILD_SRCDIR_BASE}/builds" >/dev/null
case ${spec} in
- ppc32/stage3-openrc.spec)
- upsync_binpackages
"${BUILD_SRCDIR_BASE}/packages/default/stage3-ppc" ppc/17.0/ppc
- ;;
- ppc32/stage3-musl-hardened-openrc.spec)
- upsync_binpackages
"${BUILD_SRCDIR_BASE}/packages/musl-hardened/stage3-ppc"
ppc/17.0/ppc_musl_hardened
- ;;
- ppc64/stage3-openrc.spec)
- upsync_binpackages
"${BUILD_SRCDIR_BASE}/packages/default/stage3-ppc64" ppc/17.0/ppc64
- ;;
- ppc64/stage3-musl-hardened-openrc.spec)
- upsync_binpackages
"${BUILD_SRCDIR_BASE}/packages/musl-hardened/stage3-ppc64"
ppc/17.0/ppc64_musl_hardened
- ;;
ppc32/stage3-openrc-23.spec)
upload 23.0-default/stage3-ppc-openrc-*${TIMESTAMP}*.xz*
;;
diff --git a/tools/catalyst-auto-ppc64le.conf b/tools/catalyst-auto-ppc64le.conf
index a6d46bd9..9349cc46 100644
--- a/tools/catalyst-auto-ppc64le.conf
+++ b/tools/catalyst-auto-ppc64le.conf
@@ -14,15 +14,6 @@ SETS="
musl_hardened_power9le_23
"
-SET_openrc_SPECS="stage1-openrc.spec stage3-openrc.spec"
-
-SET_openrc_power9le_SPECS="stage1-openrc-power9le.spec
stage3-openrc-power9le.spec stage3d-openrc-power9le.spec"
-
-SET_musl_hardened_SPECS="stage1-musl-hardened-openrc.spec
stage3-musl-hardened-openrc.spec"
-
-SET_musl_hardened_power9le_SPECS="stage1-musl-hardened-openrc-power9le.spec
stage3-musl-hardened-openrc-power9le.spec"
-
-
SET_openrc_23_SPECS="stage1-openrc-23.spec stage3-openrc-23.spec"
SET_openrc_23_OPTIONAL_SPECS="installcd-stage1.spec
installcd-stage2-minimal.spec"
@@ -66,18 +57,6 @@ post_build() {
installcd-stage2-minimal.spec)
upload 23.0-default/*${TIMESTAMP}*.iso*
;;
- stage3-openrc.spec)
- upsync_binpackages
"${BUILD_SRCDIR_BASE}/packages/default/stage3-ppc64le" ppc/17.0/ppc64le
- ;;
- stage3-openrc-power9le.spec)
- upsync_binpackages
"${BUILD_SRCDIR_BASE}/packages/power9le/stage3-power9le" ppc/17.0/power9le
- ;;
- stage3-musl-hardened-openrc.spec)
- upsync_binpackages
"${BUILD_SRCDIR_BASE}/packages/musl-hardened/stage3-ppc64le"
ppc/17.0/ppc64le_musl_hardened
- ;;
- stage3-musl-hardened-openrc-power9le.spec)
- upsync_binpackages
"${BUILD_SRCDIR_BASE}/packages/power9le-musl-hardened/stage3-power9le"
ppc/17.0/power9le_musl_hardened
- ;;
stage3-openrc-23.spec)
upload 23.0-default/stage3-ppc64le-openrc-${TIMESTAMP}*.xz*
;;
diff --git a/tools/catalyst-auto-qemu-alpha.conf
b/tools/catalyst-auto-qemu-alpha.conf
index b2946afc..eede9315 100644
--- a/tools/catalyst-auto-qemu-alpha.conf
+++ b/tools/catalyst-auto-qemu-alpha.conf
@@ -11,8 +11,6 @@ SETS="
systemd23
"
-SET_openrc_SPECS="stage1-openrc.spec stage3-openrc.spec"
-
SET_openrc23_SPECS="stage1-openrc-23.spec stage3-openrc-23.spec"
SET_openrc23_OPTIONAL_SPECS="installcd-stage1.spec
installcd-stage2-minimal.spec"
SET_systemd23_SPECS="stage1-systemd-23.spec stage3-systemd-23.spec"
@@ -36,14 +34,6 @@ update_symlinks() {
post_build() {
local set=$1 spec=$2
- pushd "${BUILD_SRCDIR_BASE}/builds/default" >/dev/null
- case ${spec} in
- stage3-openrc.spec)
- upsync_binpackages
"${BUILD_SRCDIR_BASE}/packages/default/stage3-alpha" alpha/17.0/alpha
- ;;
- esac
- popd >/dev/null
-
pushd "${BUILD_SRCDIR_BASE}/builds/23.0-default" >/dev/null
case ${spec} in
stage3-openrc-23.spec)
diff --git a/tools/catalyst-auto-qemu-arm64.conf
b/tools/catalyst-auto-qemu-arm64.conf
index 0fa4f46a..fdee79e7 100644
--- a/tools/catalyst-auto-qemu-arm64.conf
+++ b/tools/catalyst-auto-qemu-arm64.conf
@@ -11,8 +11,6 @@ SETS="
systemd_23
"
-SET_openrc_SPECS="stage1-openrc.spec stage3-openrc.spec"
-
SET_openrc_23_SPECS="stage1-openrc-23.spec stage3-openrc-23.spec"
SET_systemd_23_SPECS="stage1-systemd-23.spec stage3-systemd-23.spec"
@@ -39,14 +37,6 @@ update_symlinks() {
post_build() {
local set=$1 spec=$2
- pushd "${BUILD_SRCDIR_BASE}/builds/default" >/dev/null
- case ${spec} in
- stage3-openrc.spec)
- upsync_binpackages
"${BUILD_SRCDIR_BASE}/packages/default/stage3-aarch64_be" arm64/17.0/aarch64_be
- ;;
- esac
- popd >/dev/null
-
pushd "${BUILD_SRCDIR_BASE}/builds/23.0-default" >/dev/null
case ${spec} in
stage3-openrc-23.spec)
diff --git a/tools/catalyst-auto-qemu-loong.conf
b/tools/catalyst-auto-qemu-loong.conf
index 4146886f..2390be7d 100644
--- a/tools/catalyst-auto-qemu-loong.conf
+++ b/tools/catalyst-auto-qemu-loong.conf
@@ -15,8 +15,6 @@ SETS="
systemd23
"
-SET_openrc_SPECS="stage1-openrc.spec stage3-openrc.spec"
-
SET_openrc23_SPECS="stage1-openrc-23.spec stage3-openrc-23.spec"
SET_systemd23_SPECS="stage1-systemd-23.spec stage3-systemd-23.spec"
@@ -37,14 +35,6 @@ update_symlinks() {
post_build() {
local set=$1 spec=$2
- pushd "${BUILD_SRCDIR_BASE}/builds/default" >/dev/null
- case ${spec} in
- stage3-openrc.spec)
- upsync_binpackages
"${BUILD_SRCDIR_BASE}/packages/default/stage3-loong" loong/22.0/loong
- ;;
- esac
- popd >/dev/null
-
pushd "${BUILD_SRCDIR_BASE}/builds/23.0-default" >/dev/null
case ${spec} in
stage3-openrc-23.spec)
diff --git a/tools/catalyst-auto-qemu-m68k.conf
b/tools/catalyst-auto-qemu-m68k.conf
index 1dd80539..65c01527 100644
--- a/tools/catalyst-auto-qemu-m68k.conf
+++ b/tools/catalyst-auto-qemu-m68k.conf
@@ -16,10 +16,6 @@ SETS="
musl_23
"
-SET_openrc_SPECS="stage1-openrc.spec stage3-openrc.spec"
-
-SET_musl_SPECS="stage1-musl.spec stage3-musl.spec"
-
SET_openrc_23_SPECS="stage1-openrc-23.spec stage3-openrc-23.spec"
SET_systemd_23_SPECS="stage1-systemd-23.spec stage3-systemd-23.spec"
@@ -44,16 +40,6 @@ post_build() {
local set=$1 spec=$2
case ${spec} in
- stage3-openrc.spec)
- pushd "${BUILD_SRCDIR_BASE}/builds/default" >/dev/null
- upsync_binpackages
"${BUILD_SRCDIR_BASE}/packages/default/stage3-m68k" m68k/17.0/m68k
- popd >/dev/null
- ;;
- stage3-musl.spec)
- pushd "${BUILD_SRCDIR_BASE}/builds/musl" >/dev/null
- upsync_binpackages
"${BUILD_SRCDIR_BASE}/packages/musl/stage3-m68k_musl" m68k/17.0/m68k_musl
- popd >/dev/null
- ;;
stage3-openrc-23.spec)
pushd "${BUILD_SRCDIR_BASE}/builds/23.0-default"
>/dev/null
upload stage3-m68k-openrc-${TIMESTAMP}*.xz*
diff --git a/tools/catalyst-auto-qemu-mips-common
b/tools/catalyst-auto-qemu-mips-common
index b65ddd23..bc4a96bc 100644
--- a/tools/catalyst-auto-qemu-mips-common
+++ b/tools/catalyst-auto-qemu-mips-common
@@ -6,15 +6,6 @@ UPLOAD_KEY=/root/.ssh/id_rsa
SPECS_DIR=${REPO_DIR}/releases/specs-qemu/mips
EMAIL_SUBJECT_PREPEND="[mips-qemu-auto]"
-SETS_O32_17="
- mipsel2_softfloat_o32_openrc
- mipsel2_o32_openrc
- mipsel2_o32_musl
- mips2_softfloat_o32_openrc
- mips2_o32_openrc
- mips2_o32_musl
-"
-
SETS_O32_23="
mipsel2_softfloat_o32_openrc_23
mipsel2_softfloat_o32_systemd_23
@@ -30,11 +21,6 @@ SETS_O32_23="
SETS_O32="${SETS_O32_23}"
-SETS_N32_17="
- mipsel3_n32_openrc
- mips3_n32_openrc
-"
-
SETS_N32_23="
mipsel3_n32_openrc_23
mipsel3_n32_systemd_23
@@ -44,11 +30,6 @@ SETS_N32_23="
SETS_N32="${SETS_N32_23}"
-SETS_N64_17="
- mipsel3_n64_openrc
- mips3_n64_openrc
-"
-
SETS_N64_23="
mipsel3_n64_openrc_23
mipsel3_n64_systemd_23
@@ -58,11 +39,6 @@ SETS_N64_23="
SETS_N64="${SETS_N64_23}"
-SETS_MULTI_17="
- mipsel3_multilib_openrc
- mips3_multilib_openrc
-"
-
SETS_MULTI_23="
mipsel3_multilib_openrc_23
mipsel3_multilib_systemd_23
@@ -73,20 +49,6 @@ SETS_MULTI_23="
SETS_MULTI="${SETS_MULTI_23}"
-# 17.0 O32
-
-SET_mips2_o32_openrc_SPECS="stage1-mips2-o32-openrc.spec
stage3-mips2-o32-openrc.spec"
-
-SET_mips2_softfloat_o32_openrc_SPECS="stage1-mips2_softfloat-o32-openrc.spec
stage3-mips2_softfloat-o32-openrc.spec"
-
-SET_mips2_o32_musl_SPECS="stage1-mips2-o32-musl.spec
stage3-mips2-o32-musl.spec"
-
-SET_mipsel2_o32_openrc_SPECS="stage1-mipsel2-o32-openrc.spec
stage3-mipsel2-o32-openrc.spec"
-
-SET_mipsel2_softfloat_o32_openrc_SPECS="stage1-mipsel2_softfloat-o32-openrc.spec
stage3-mipsel2_softfloat-o32-openrc.spec"
-
-SET_mipsel2_o32_musl_SPECS="stage1-mipsel2-o32-musl.spec
stage3-mipsel2-o32-musl.spec"
-
# 23.0 O32
SET_mips2_o32_openrc_23_SPECS="o32/stage1-mips2-o32-openrc-23.spec
o32/stage3-mips2-o32-openrc-23.spec"
@@ -105,12 +67,6 @@
SET_mipsel2_softfloat_o32_systemd_23_SPECS="o32/stage1-mipsel2_softfloat-o32-sys
SET_mipsel2_o32_musl_23_SPECS="o32/stage1-mipsel2-o32-musl-23.spec
o32/stage3-mipsel2-o32-musl-23.spec"
-# 17.0 N32
-
-SET_mips3_n32_openrc_SPECS="stage1-mips3-n32-openrc.spec
stage3-mips3-n32-openrc.spec"
-
-SET_mipsel3_n32_openrc_SPECS="stage1-mipsel3-n32-openrc.spec
stage3-mipsel3-n32-openrc.spec"
-
# 23.0 N32
SET_mips3_n32_openrc_23_SPECS="n32/stage1-mips3-n32-openrc-23.spec
n32/stage3-mips3-n32-openrc-23.spec"
@@ -119,12 +75,6 @@
SET_mips3_n32_systemd_23_SPECS="n32/stage1-mips3-n32-systemd-23.spec n32/stage3-
SET_mipsel3_n32_openrc_23_SPECS="n32/stage1-mipsel3-n32-openrc-23.spec
n32/stage3-mipsel3-n32-openrc-23.spec"
SET_mipsel3_n32_systemd_23_SPECS="n32/stage1-mipsel3-n32-systemd-23.spec
n32/stage3-mipsel3-n32-systemd-23.spec"
-# 17.0 N64
-
-SET_mips3_n64_openrc_SPECS="stage1-mips3-n64-openrc.spec
stage3-mips3-n64-openrc.spec"
-
-SET_mipsel3_n64_openrc_SPECS="stage1-mipsel3-n64-openrc.spec
stage3-mipsel3-n64-openrc.spec"
-
# 23.0 N64
SET_mips3_n64_openrc_23_SPECS="n64/stage1-mips3-n64-openrc-23.spec
n64/stage3-mips3-n64-openrc-23.spec"
@@ -133,12 +83,6 @@
SET_mips3_n64_systemd_23_SPECS="n64/stage1-mips3-n64-systemd-23.spec n64/stage3-
SET_mipsel3_n64_openrc_23_SPECS="n64/stage1-mipsel3-n64-openrc-23.spec
n64/stage3-mipsel3-n64-openrc-23.spec"
SET_mipsel3_n64_systemd_23_SPECS="n64/stage1-mipsel3-n64-systemd-23.spec
n64/stage3-mipsel3-n64-systemd-23.spec"
-# 17.0 multilib
-
-SET_mips3_multilib_openrc_SPECS="stage1-mips3-multilib-openrc.spec
stage3-mips3-multilib-openrc.spec"
-
-SET_mipsel3_multilib_openrc_SPECS="stage1-mipsel3-multilib-openrc.spec
stage3-mipsel3-multilib-openrc.spec"
-
# 23.0 multilib
SET_mips3_multilib_openrc_23_SPECS="multilib/stage1-mips3-multilib-openrc-23.spec
multilib/stage3-mips3-multilib-openrc-23.spec"
@@ -168,41 +112,6 @@ update_symlinks() {
post_build() {
local set=$1 spec=$2
- pushd "${BUILD_SRCDIR_BASE}/builds/default" >/dev/null
- case ${spec} in
- stage3-mips2-o32-openrc.spec)
- upsync_binpackages
"${BUILD_SRCDIR_BASE}/packages/default/stage3-mips2" mips/17.0/mips2_o32
- ;;
- stage3-mips2_softfloat-o32-openrc.spec)
- upsync_binpackages
"${BUILD_SRCDIR_BASE}/packages/default/stage3-mips2_softfloat"
mips/17.0/mips2_o32_softfloat
- ;;
- stage3-mipsel2-o32-openrc.spec)
- upsync_binpackages
"${BUILD_SRCDIR_BASE}/packages/default/stage3-mipsel2" mips/17.0/mipsel2_o32
- ;;
- stage3-mipsel2_softfloat-o32-openrc.spec)
- upsync_binpackages
"${BUILD_SRCDIR_BASE}/packages/default/stage3-mipsel2_softfloat"
mips/17.0/mipsel2_o32_softfloat
- ;;
- stage3-mips3-n32-openrc.spec)
- upsync_binpackages
"${BUILD_SRCDIR_BASE}/packages/default/stage3-mips3_n32" mips/17.0/mips3_n32
- ;;
- stage3-mipsel3-n32-openrc.spec)
- upsync_binpackages
"${BUILD_SRCDIR_BASE}/packages/default/stage3-mipsel3_n32" mips/17.0/mipsel3_n32
- ;;
- stage3-mips3-n64-openrc.spec)
- upsync_binpackages
"${BUILD_SRCDIR_BASE}/packages/default/stage3-mips3_n64" mips/17.0/mips3_n64
- ;;
- stage3-mipsel3-n64-openrc.spec)
- upsync_binpackages
"${BUILD_SRCDIR_BASE}/packages/default/stage3-mipsel3_n64" mips/17.0/mipsel3_n64
- ;;
- stage3-mips3-multilib-openrc.spec)
- upsync_binpackages
"${BUILD_SRCDIR_BASE}/packages/default/stage3-mips3_multilib"
mips/17.0/mips3_multilib
- ;;
- stage3-mipsel3-multilib-openrc.spec)
- upsync_binpackages
"${BUILD_SRCDIR_BASE}/packages/default/stage3-mipsel3_multilib"
mips/17.0/mipsel3_multilib
- ;;
- esac
- popd >/dev/null
-
pushd "${BUILD_SRCDIR_BASE}/builds/23.0-default" >/dev/null
case ${spec} in
o32/stage3-mips2-o32-openrc-23.spec)
@@ -278,17 +187,6 @@ post_build() {
esac
popd >/dev/null
- pushd "${BUILD_SRCDIR_BASE}/builds/musl" >/dev/null
- case ${spec} in
- stage3-mips2-o32-musl.spec)
- upsync_binpackages
"${BUILD_SRCDIR_BASE}/packages/musl/stage3-mips2_musl" mips/17.0/mips2_o32_musl
- ;;
- stage3-mipsel2-o32-musl.spec)
- upsync_binpackages
"${BUILD_SRCDIR_BASE}/packages/musl/stage3-mipsel2_musl"
mips/17.0/mipsel2_o32_musl
- ;;
- esac
- popd >/dev/null
-
pushd "${BUILD_SRCDIR_BASE}/builds/23.0-musl" >/dev/null
case ${spec} in
o32/stage3-mips2-o32-musl-23.spec)
diff --git a/tools/catalyst-auto-qemu-riscv.conf
b/tools/catalyst-auto-qemu-riscv.conf
index 5b7bdb94..894248aa 100644
--- a/tools/catalyst-auto-qemu-riscv.conf
+++ b/tools/catalyst-auto-qemu-riscv.conf
@@ -27,14 +27,6 @@ SETS="
ilp32_musl_23
"
-SET_lp64d_musl_SPECS="stage1-lp64d-musl.spec stage3-lp64d-musl.spec"
-SET_lp64d_openrc_SPECS="stage1-lp64d-openrc.spec stage3-lp64d-openrc.spec"
-
-SET_lp64_musl_SPECS="stage1-lp64-musl.spec stage3-lp64-musl.spec"
-SET_lp64_openrc_SPECS="stage1-lp64-openrc.spec stage3-lp64-openrc.spec"
-
-SET_multilib_openrc_SPECS="stage1-multilib-openrc.spec
stage3-multilib-openrc.spec"
-
SET_lp64d_musl_23_SPECS="stage1-lp64d-musl-23.spec stage3-lp64d-musl-23.spec"
SET_lp64d_openrc_23_SPECS="stage1-lp64d-openrc-23.spec
stage3-lp64d-openrc-23.spec"
SET_lp64d_systemd_23_SPECS="stage1-lp64d-systemd-23.spec
stage3-lp64d-systemd-23.spec"
@@ -124,15 +116,6 @@ post_build() {
upload
builds/23.0-musl/stage3-rv32_ilp32_musl-${TIMESTAMP}*.xz*
upsync_binpackages
packages/23.0-musl/stage3-rv32_ilp32_musl riscv/23.0/rv32_ilp32_musl
;;
- stage3*openrc.spec)
- upsync_binpackages packages/default/stage3-rv64_lp64d
riscv/20.0/rv64_lp64d
- upsync_binpackages packages/default/stage3-rv64_lp64
riscv/20.0/rv64_lp64
- upsync_binpackages
packages/default/stage3-rv64_multilib riscv/20.0/rv64_multilib
- ;;
- stage3*musl.spec)
- upsync_binpackages packages/musl/stage3-rv64_lp64d_musl
riscv/20.0/rv64_lp64d_musl
- upsync_binpackages packages/musl/stage3-rv64_lp64_musl
riscv/20.0/rv64_lp64_musl
- ;;
*)
echo "Finished ${spec}"
;;
diff --git a/tools/catalyst-auto-s390x.conf b/tools/catalyst-auto-s390x.conf
index ee4297c2..3f5b9eac 100644
--- a/tools/catalyst-auto-s390x.conf
+++ b/tools/catalyst-auto-s390x.conf
@@ -12,15 +12,11 @@ SETS="
systemd_32_23
"
-SET_openrc_64_SPECS="s390x/stage1-openrc.spec s390x/stage3-openrc.spec"
-
SET_openrc_64_23_SPECS="s390x/stage1-openrc-23.spec
s390x/stage3-openrc-23.spec"
SET_openrc_64_23_OPTIONAL_SPECS="s390x/netboot/netboot.spec"
SET_systemd_64_23_SPECS="s390x/stage1-systemd-23.spec
s390x/stage3-systemd-23.spec"
-SET_openrc_32_SPECS="s390/stage1-openrc.spec s390/stage3-openrc.spec"
-
SET_openrc_32_23_SPECS="s390/stage1-openrc-23.spec s390/stage3-openrc-23.spec"
SET_openrc_32_23_OPTIONAL_SPECS="s390/netboot/netboot.spec"
@@ -47,17 +43,6 @@ update_symlinks() {
post_build() {
local set=$1 spec=$2
- pushd "${BUILD_SRCDIR_BASE}/builds/default" >/dev/null
- case ${spec} in
- s390x/stage3-openrc.spec)
- upsync_binpackages
"${BUILD_SRCDIR_BASE}/packages/default/stage3-s390x" s390/17.0/s390x
- ;;
- s390/stage3-openrc.spec)
- upsync_binpackages
"${BUILD_SRCDIR_BASE}/packages/default/stage3-s390" s390/17.0/s390
- ;;
- esac
- popd >/dev/null
-
pushd "${BUILD_SRCDIR_BASE}/builds/23.0-default" >/dev/null
case ${spec} in
s390x/stage3-openrc-23.spec)
diff --git a/tools/catalyst-auto-sparc64.conf b/tools/catalyst-auto-sparc64.conf
index f7f243e0..bb93275a 100644
--- a/tools/catalyst-auto-sparc64.conf
+++ b/tools/catalyst-auto-sparc64.conf
@@ -12,10 +12,6 @@ SETS="
systemd_64_23
"
-SET_openrc_32_SPECS="sparc/stage1.spec sparc/stage3.spec"
-
-SET_openrc_64_SPECS="sparc64/stage1.spec sparc64/stage3.spec"
-
SET_openrc_32_23_SPECS="sparc/stage1-openrc-23.spec
sparc/stage3-openrc-23.spec"
SET_systemd_32_23_SPECS="sparc/stage1-systemd-23.spec
sparc/stage3-systemd-23.spec"
@@ -49,17 +45,6 @@ update_symlinks() {
post_build() {
local set=$1 spec=$2
- pushd "${BUILD_SRCDIR_BASE}/builds/default" >/dev/null
- case ${spec} in
- sparc/stage3.spec)
- upsync_binpackages
"${BUILD_SRCDIR_BASE}/packages/default/stage3-sparc" sparc/17.0/32
- ;;
- sparc64/stage3.spec)
- upsync_binpackages
"${BUILD_SRCDIR_BASE}/packages/default/stage3-sparc64" sparc/17.0/64
- ;;
- esac
- popd >/dev/null
-
pushd "${BUILD_SRCDIR_BASE}/builds/23.0-default" >/dev/null
case ${spec} in
sparc/stage3-openrc-23.spec)
diff --git a/tools/catalyst-auto-x86.conf b/tools/catalyst-auto-x86.conf
index 8cfd0b1e..b3fbb54a 100644
--- a/tools/catalyst-auto-x86.conf
+++ b/tools/catalyst-auto-x86.conf
@@ -18,26 +18,18 @@ SETS="
musl_23
"
-SET_i486_openrc_SPECS="i486/stage1-openrc.spec i486/stage3-openrc.spec"
-
SET_i486_openrc_23_SPECS="i486/stage1-openrc-23.spec
i486/stage3-openrc-23.spec"
SET_i486_openrc_23_OPTIONAL_SPECS="i486/installcd-stage1-openrc.spec
i486/installcd-stage2-minimal-openrc.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_23_SPECS="i686/stage1-systemd-23.spec
i686/stage3-systemd-23.spec"
-SET_hardened_openrc_SPECS="hardened/stage1-openrc.spec
hardened/stage3-openrc.spec"
-
SET_hardened_openrc_23_SPECS="hardened/stage1-openrc-23.spec
hardened/stage3-openrc-23.spec"
SET_hardened_openrc_23_OPTIONAL_SPECS="hardened/admincd-stage1-openrc.spec
hardened/admincd-stage2-openrc.spec"
-SET_musl_SPECS="musl/stage1.spec musl/stage3.spec"
-
SET_musl_23_SPECS="musl/stage1-23.spec musl/stage3-23.spec"
@@ -71,17 +63,6 @@ update_symlinks() {
post_build() {
local set=$1 spec=$2
- pushd ${BUILD_SRCDIR_BASE}/builds/default >/dev/null || exit
- case ${spec} in
- i486/stage3-openrc.spec)
- upsync_binpackages
"${BUILD_SRCDIR_BASE}/packages/default/stage3-i486" x86/17.0/i486
- ;;
- i686/stage3-openrc.spec)
- upsync_binpackages
"${BUILD_SRCDIR_BASE}/packages/default/stage3-i686" x86/17.0/i686
- ;;
- esac
- popd >/dev/null || exit
-
pushd ${BUILD_SRCDIR_BASE}/builds/23.0-default >/dev/null || exit
case ${spec} in
i486/stage3-openrc-23.spec)
@@ -104,14 +85,6 @@ post_build() {
esac
popd >/dev/null || exit
- pushd ${BUILD_SRCDIR_BASE}/builds/hardened >/dev/null || exit
- case ${spec} in
- hardened/stage3-openrc.spec)
- upsync_binpackages
"${BUILD_SRCDIR_BASE}/packages/hardened/stage3-i686" x86/17.0/i686_hardened
- ;;
- esac
- popd >/dev/null || exit
-
pushd ${BUILD_SRCDIR_BASE}/builds/23.0-hardened >/dev/null || exit
case ${spec} in
hardened/stage3-openrc-23.spec)
@@ -124,14 +97,6 @@ post_build() {
esac
popd >/dev/null || exit
- pushd ${BUILD_SRCDIR_BASE}/builds/musl >/dev/null || exit
- case ${spec} in
- musl/stage3.spec)
- upsync_binpackages
"${BUILD_SRCDIR_BASE}/packages/musl/stage3-i686" x86/17.0/i686_musl
- ;;
- esac
- popd >/dev/null || exit
-
pushd ${BUILD_SRCDIR_BASE}/builds/23.0-musl >/dev/null || exit
case ${spec} in
musl/stage3-23.spec)
