1 |
commit: c65a62093029c452f9ca5c266d046caefcfc27fd |
2 |
Author: Matthew Thode <mthode <AT> mthode <DOT> org> |
3 |
AuthorDate: Sun Dec 3 21:20:03 2017 +0000 |
4 |
Commit: Matt Thode <prometheanfire <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Dec 3 21:20:03 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=c65a6209 |
7 |
|
8 |
remove stage4 cloud stages from tools/catalyst-auto-amd64.conf |
9 |
|
10 |
tools/catalyst-auto-amd64.conf | 12 ++++-------- |
11 |
1 file changed, 4 insertions(+), 8 deletions(-) |
12 |
|
13 |
diff --git a/tools/catalyst-auto-amd64.conf b/tools/catalyst-auto-amd64.conf |
14 |
index ea0a6cea..35bc255d 100644 |
15 |
--- a/tools/catalyst-auto-amd64.conf |
16 |
+++ b/tools/catalyst-auto-amd64.conf |
17 |
@@ -11,21 +11,19 @@ SPECS_DIR=${REPO_DIR}/releases/weekly/specs/${ARCH} |
18 |
|
19 |
#SETS="multilib nomultilib x32 hardened_multilib hardened_nomultilib hardened_multilib_selinux hardened_nomultilib_selinux" |
20 |
SETS=" |
21 |
- multilib cloud_multilib minimal_multilib |
22 |
- nomultilib cloud_nomultilib minimal_nomultilib |
23 |
+ multilib minimal_multilib |
24 |
+ nomultilib minimal_nomultilib |
25 |
x32 |
26 |
- hardened_multilib cloud_hardened_multilib minimal_hardened_multilib |
27 |
- hardened_nomultilib cloud_hardened_nomultilib minimal_hardened_nomultilib |
28 |
+ hardened_multilib minimal_hardened_multilib |
29 |
+ hardened_nomultilib minimal_hardened_nomultilib |
30 |
hardened_multilib_selinux hardened_nomultilib_selinux |
31 |
" |
32 |
# systemd |
33 |
|
34 |
SET_multilib_SPECS="stage1.spec stage2.spec stage3.spec" |
35 |
SET_multilib_OPTIONAL_SPECS="installcd-stage1.spec installcd-stage2-minimal.spec" |
36 |
-SET_cloud_multilib_SPECS="stage4-cloud.spec" |
37 |
SET_minimal_multilib_SPECS="stage4-minimal.spec" |
38 |
SET_nomultilib_SPECS="stage1-nomultilib.spec stage2-nomultilib.spec stage3-nomultilib.spec" |
39 |
-SET_cloud_nomultilib_SPECS="stage4-nomultilib-cloud.spec" |
40 |
SET_minimal_nomultilib_SPECS="stage4-nomultilib-minimal.spec" |
41 |
|
42 |
SET_x32_SPECS="stage1-x32.spec stage2-x32.spec stage3-x32.spec" |
43 |
@@ -35,10 +33,8 @@ SET_systemd_SPECS="stage4-systemd.spec" |
44 |
|
45 |
SET_hardened_multilib_SPECS="hardened/stage1.spec hardened/stage2.spec hardened/stage3.spec" |
46 |
SET_hardened_multilib_OPTIONAL_SPECS="hardened/admincd-stage1.spec hardened/admincd-stage2.spec" |
47 |
-SET_cloud_hardened_multilib_SPECS="hardened/stage4-cloud.spec" |
48 |
SET_minimal_hardened_multilib_SPECS="hardened/stage4-minimal.spec" |
49 |
SET_hardened_nomultilib_SPECS="hardened/stage1-nomultilib.spec hardened/stage2-nomultilib.spec hardened/stage3-nomultilib.spec" |
50 |
-SET_cloud_hardened_nomultilib_SPECS="hardened/stage4-nomultilib-cloud.spec" |
51 |
SET_minimal_hardened_nomultilib_SPECS="hardened/stage4-nomultilib-minimal.spec" |
52 |
|
53 |
SET_hardened_multilib_selinux_SPECS="hardened/stage1-selinux.spec hardened/stage2-selinux.spec hardened/stage3-selinux.spec" |