Build 23.0 first

Signed-off-by: Andreas K. Hüttel <dilfridge@gentoo.org>

tools/catalyst-auto-amd64.conf

@@ -10,6 +10,21 @@ EMAIL_SUBJECT_PREPEND="[amd64-auto]"
 SPECS_DIR=${REPO_DIR}/releases/specs/amd64
 
 SETS="
+	openrc_23
+	systemd_23
+	nomultilib_openrc_23
+	nomultilib_systemd_23
+	llvm_openrc_23
+	llvm_systemd_23
+	hardened_openrc_23
+	hardened_systemd_23
+	hardened_selinux_openrc_23
+	hardened_selinux_systemd_23
+	musl_23
+	musl_hardened_23
+	musl_llvm_23
+	x32_openrc_23
+	x32_systemd_23
 	openrc
 	systemd_mu
 	livegui
@@ -26,21 +41,6 @@ SETS="
 	musl_llvm
 	x32_openrc
 	x32_systemd_mu
-	openrc_23
-	systemd_23
-	nomultilib_openrc_23
-	nomultilib_systemd_23
-	llvm_openrc_23
-	llvm_systemd_23
-	hardened_openrc_23
-	hardened_systemd_23
-	hardened_selinux_openrc_23
-	hardened_selinux_systemd_23
-	musl_23
-	musl_hardened_23
-	musl_llvm_23
-	x32_openrc_23
-	x32_systemd_23
 "
 
 # 17.0

tools/catalyst-auto-arm.conf

@@ -11,22 +11,6 @@ SPECS_DIR=${REPO_DIR}/releases/specs/arm
 EMAIL_SUBJECT_PREPEND="[arm-auto]"
 
 SETS="
-	armv4tl_openrc
-	armv4tl_systemd_mu
-	armv5tel_openrc
-	armv5tel_systemd_mu
-	armv6j_hf_openrc
-	armv6j_hf_systemd_mu
-	armv6j_sf_openrc
-	armv6j_sf_systemd_mu
-	armv6j_hf_musl_openrc
-	armv6j_hf_musl_hardened_openrc
-	armv7a_hf_openrc
-	armv7a_hf_systemd_mu
-	armv7a_sf_openrc
-	armv7a_sf_systemd_mu
-	armv7a_hf_musl_openrc
-	armv7a_hf_musl_hardened_openrc
 	armv4tl_openrc_23
 	armv4tl_systemd_23
 	armv5tel_openrc_23
@@ -43,6 +27,22 @@ SETS="
 	armv7a_sf_systemd_23
 	armv7a_hf_musl_openrc_23
 	armv7a_hf_musl_hardened_openrc_23
+	armv4tl_openrc
+	armv4tl_systemd_mu
+	armv5tel_openrc
+	armv5tel_systemd_mu
+	armv6j_hf_openrc
+	armv6j_hf_systemd_mu
+	armv6j_sf_openrc
+	armv6j_sf_systemd_mu
+	armv6j_hf_musl_openrc
+	armv6j_hf_musl_hardened_openrc
+	armv7a_hf_openrc
+	armv7a_hf_systemd_mu
+	armv7a_sf_openrc
+	armv7a_sf_systemd_mu
+	armv7a_hf_musl_openrc
+	armv7a_hf_musl_hardened_openrc
 "
 
 SET_armv4tl_openrc_SPECS="armv4tl/stage1-openrc.spec armv4tl/stage3-openrc.spec"

tools/catalyst-auto-arm64.conf

@@ -7,13 +7,6 @@ SPECS_DIR=${REPO_DIR}/releases/specs/arm64
 SUBARCH=arm64
 
 SETS="
-	openrc
-	systemd_mu
-	llvm_openrc
-	llvm_systemd_mu
-	musl
-	musl_hardened
-	musl_llvm
 	openrc_23
 	systemd_23
 	llvm_openrc_23
@@ -21,6 +14,13 @@ SETS="
 	musl_23
 	musl_hardened_23
 	musl_llvm_23
+	openrc
+	systemd_mu
+	llvm_openrc
+	llvm_systemd_mu
+	musl
+	musl_hardened
+	musl_llvm
 "
 
 SET_openrc_SPECS="stage1-openrc.spec stage3-openrc.spec stage3d-openrc.spec"

tools/catalyst-auto-ia64.conf

@@ -6,10 +6,10 @@ UPLOAD_KEY=/root/.ssh/id_rsa
 SPECS_DIR=${REPO_DIR}/releases/specs/ia64
 
 SETS="
-	openrc
-	systemd_mu
 	openrc_23
 	systemd_23
+	openrc
+	systemd_mu
 "
 
 SET_openrc_SPECS="stage1-openrc.spec stage3-openrc.spec"

tools/catalyst-auto-ppc.conf

@@ -6,18 +6,18 @@ UPLOAD_KEY=/root/.ssh/id_rsa
 SPECS_DIR=${REPO_DIR}/releases/specs/ppc
 
 SETS="
-	openrc
-	systemd_mu
-	musl_hardened
 	openrc_23
 	systemd_23
 	musl_hardened_23
-	openrc_64
-	systemd_mu_64
-	musl_hardened_64
 	openrc_64_23
 	systemd_64_23
 	musl_hardened_64_23
+	openrc
+	systemd_mu
+	musl_hardened
+	openrc_64
+	systemd_mu_64
+	musl_hardened_64
 "
  
 SET_openrc_SPECS="ppc32/stage1-openrc.spec ppc32/stage3-openrc.spec"

tools/catalyst-auto-ppc64le.conf

@@ -6,18 +6,18 @@ UPLOAD_KEY=/root/.ssh/id_rsa
 SPECS_DIR=${REPO_DIR}/releases/specs/ppc/ppc64le
 
 SETS="
-	openrc
-	systemd_mu
-	openrc_power9le
-	systemd_power9le_mu
-	musl_hardened
-	musl_hardened_power9le
 	openrc_23
 	systemd_23
 	openrc_power9le_23
 	systemd_power9le_23
 	musl_hardened_23
 	musl_hardened_power9le_23
+	openrc
+	systemd_mu
+	openrc_power9le
+	systemd_power9le_mu
+	musl_hardened
+	musl_hardened_power9le
 "
 
 SET_openrc_SPECS="stage1-openrc.spec stage3-openrc.spec"

tools/catalyst-auto-qemu-alpha.conf

@@ -6,7 +6,12 @@ UPLOAD_KEY=/root/.ssh/id_ed25519
 SPECS_DIR=${REPO_DIR}/releases/specs-qemu/alpha
 EMAIL_SUBJECT_PREPEND="[alpha-qemu-auto]"
 
-SETS="openrc systemd_mu openrc23 systemd23"
+SETS="
+	openrc23
+	systemd23
+	openrc
+	systemd_mu
+"
 
 SET_openrc_SPECS="stage1-openrc.spec stage3-openrc.spec"
 SET_openrc_OPTIONAL_SPECS="installcd-stage1.spec installcd-stage2-minimal.spec"

tools/catalyst-auto-qemu-arm64.conf

@@ -7,10 +7,10 @@ SPECS_DIR=${REPO_DIR}/releases/specs-qemu/arm64/be
 SUBARCH=aarch64_be
 
 SETS="
-	openrc
-	systemd_mu
 	openrc_23
 	systemd_23
+	openrc
+	systemd_mu
 "
 
 SET_openrc_SPECS="stage1-openrc.spec stage3-openrc.spec"

tools/catalyst-auto-qemu-loong.conf

@@ -11,10 +11,10 @@ SPECS_DIR=${REPO_DIR}/releases/specs-qemu/loong
 EMAIL_SUBJECT_PREPEND="[loong-qemu-auto]"
 
 SETS="
-	openrc
-	systemd_mu
 	openrc23
 	systemd23
+	openrc
+	systemd_mu
 "
 
 SET_openrc_SPECS="stage1-openrc.spec stage3-openrc.spec"

tools/catalyst-auto-qemu-m68k.conf

@@ -11,12 +11,12 @@ SPECS_DIR=${REPO_DIR}/releases/specs-qemu/m68k
 EMAIL_SUBJECT_PREPEND="[m68k-qemu-auto]"
 
 SETS="
-	openrc
-	systemd_mu
-	musl
 	openrc_23
 	systemd_23
 	musl_23
+	openrc
+	systemd_mu
+	musl
 "
 
 SET_openrc_SPECS="stage1-openrc.spec stage3-openrc.spec"

tools/catalyst-auto-qemu-riscv.conf

@@ -11,14 +11,6 @@ SPECS_DIR=${REPO_DIR}/releases/specs-qemu/riscv
 EMAIL_SUBJECT_PREPEND="[riscv-qemu-auto]"
 
 SETS="
-	lp64d_openrc
-	lp64d_systemd_mu
-	lp64d_musl
-	lp64_openrc
-	lp64_systemd_mu
-	lp64_musl
-	multilib_openrc
-	multilib_systemd_mu
 	lp64d_openrc_23
 	lp64d_systemd_23
 	lp64d_musl_23
@@ -27,6 +19,14 @@ SETS="
 	lp64_musl_23
 	multilib_openrc_23
 	multilib_systemd_23
+	lp64d_openrc
+	lp64d_systemd_mu
+	lp64d_musl
+	lp64_openrc
+	lp64_systemd_mu
+	lp64_musl
+	multilib_openrc
+	multilib_systemd_mu
 "
 
 SET_lp64d_musl_SPECS="stage1-lp64d-musl.spec stage3-lp64d-musl.spec"

tools/catalyst-auto-s390.conf

@@ -7,10 +7,10 @@ SPECS_DIR=${REPO_DIR}/releases/specs/s390/s390
 SUBARCH=s390
 
 SETS="
-	openrc
-	systemd_mu
 	openrc_23
 	systemd_23
+	openrc
+	systemd_mu
 "
 
 SET_openrc_SPECS="stage1-openrc.spec stage3-openrc.spec"

tools/catalyst-auto-s390x.conf

@@ -7,10 +7,10 @@ SPECS_DIR=${REPO_DIR}/releases/specs/s390/s390x
 SUBARCH=s390x
 
 SETS="
-	openrc
-	systemd_mu
 	openrc_23
 	systemd_23
+	openrc
+	systemd_mu
 "
 
 SET_openrc_SPECS="stage1-openrc.spec stage3-openrc.spec"

tools/catalyst-auto-sparc64.conf

@@ -6,14 +6,14 @@ UPLOAD_KEY=/root/.ssh/id_ed25519
 SPECS_DIR=${REPO_DIR}/releases/specs/sparc
 
 SETS="
-	openrc_32
-	systemd_32_mu
 	openrc_32_23
 	systemd_32_23
-	openrc_64
-	systemd_64_mu
 	openrc_64_23
 	systemd_64_23
+	openrc_32
+	systemd_32_mu
+	openrc_64
+	systemd_64_mu
 "
 
 SET_openrc_32_SPECS="sparc/stage1.spec sparc/stage3.spec"

tools/catalyst-auto-x86.conf

@@ -10,17 +10,17 @@ EMAIL_SUBJECT_PREPEND="[x86-auto]"
 SPECS_DIR=${REPO_DIR}/releases/specs/x86
 
 SETS="
+	i486_openrc_23
+	i486_systemd_23
+	i686_openrc_23
+	i686_systemd_23
+	hardened_openrc_23
 	i486_openrc
 	i486_systemd_mu
 	i686_openrc
 	i686_systemd_mu
 	hardened_openrc
 	musl
-	i486_openrc_23
-	i486_systemd_23
-	i686_openrc_23
-	i686_systemd_23
-	hardened_openrc_23
 "
 #	musl_23