commit: c65a62093029c452f9ca5c266d046caefcfc27fd
Author: Matthew Thode <mthode <AT> mthode <DOT> org>
AuthorDate: Sun Dec 3 21:20:03 2017 +0000
Commit: Matt Thode <prometheanfire <AT> gentoo <DOT> org>
CommitDate: Sun Dec 3 21:20:03 2017 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=c65a6209
remove stage4 cloud stages from tools/catalyst-auto-amd64.conf
tools/catalyst-auto-amd64.conf | 12 ++++--------
1 file changed, 4 insertions(+), 8 deletions(-)
diff --git a/tools/catalyst-auto-amd64.conf b/tools/catalyst-auto-amd64.conf
index ea0a6cea..35bc255d 100644
--- a/tools/catalyst-auto-amd64.conf
+++ b/tools/catalyst-auto-amd64.conf
@@ -11,21 +11,19 @@ SPECS_DIR=${REPO_DIR}/releases/weekly/specs/${ARCH}
#SETS="multilib nomultilib x32 hardened_multilib hardened_nomultilib
hardened_multilib_selinux hardened_nomultilib_selinux"
SETS="
- multilib cloud_multilib minimal_multilib
- nomultilib cloud_nomultilib minimal_nomultilib
+ multilib minimal_multilib
+ nomultilib minimal_nomultilib
x32
- hardened_multilib cloud_hardened_multilib minimal_hardened_multilib
- hardened_nomultilib cloud_hardened_nomultilib
minimal_hardened_nomultilib
+ hardened_multilib minimal_hardened_multilib
+ hardened_nomultilib minimal_hardened_nomultilib
hardened_multilib_selinux hardened_nomultilib_selinux
"
# systemd
SET_multilib_SPECS="stage1.spec stage2.spec stage3.spec"
SET_multilib_OPTIONAL_SPECS="installcd-stage1.spec
installcd-stage2-minimal.spec"
-SET_cloud_multilib_SPECS="stage4-cloud.spec"
SET_minimal_multilib_SPECS="stage4-minimal.spec"
SET_nomultilib_SPECS="stage1-nomultilib.spec stage2-nomultilib.spec
stage3-nomultilib.spec"
-SET_cloud_nomultilib_SPECS="stage4-nomultilib-cloud.spec"
SET_minimal_nomultilib_SPECS="stage4-nomultilib-minimal.spec"
SET_x32_SPECS="stage1-x32.spec stage2-x32.spec stage3-x32.spec"
@@ -35,10 +33,8 @@ SET_systemd_SPECS="stage4-systemd.spec"
SET_hardened_multilib_SPECS="hardened/stage1.spec hardened/stage2.spec
hardened/stage3.spec"
SET_hardened_multilib_OPTIONAL_SPECS="hardened/admincd-stage1.spec
hardened/admincd-stage2.spec"
-SET_cloud_hardened_multilib_SPECS="hardened/stage4-cloud.spec"
SET_minimal_hardened_multilib_SPECS="hardened/stage4-minimal.spec"
SET_hardened_nomultilib_SPECS="hardened/stage1-nomultilib.spec
hardened/stage2-nomultilib.spec hardened/stage3-nomultilib.spec"
-SET_cloud_hardened_nomultilib_SPECS="hardened/stage4-nomultilib-cloud.spec"
SET_minimal_hardened_nomultilib_SPECS="hardened/stage4-nomultilib-minimal.spec"
SET_hardened_multilib_selinux_SPECS="hardened/stage1-selinux.spec
hardened/stage2-selinux.spec hardened/stage3-selinux.spec"
