1 |
commit: 006fc1f0470abce0c2f8f4df4f4a339fa1c4d551 |
2 |
Author: Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo <DOT> org> |
3 |
AuthorDate: Fri Dec 18 01:53:56 2015 +0000 |
4 |
Commit: Jorge Manuel B. S. Vicetto <jmbsvicetto <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri Dec 18 01:55:24 2015 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=006fc1f0 |
7 |
|
8 |
Rename the stage4 to "cloud" in case we decide to add more stage4 later. |
9 |
|
10 |
Signed-off-by: Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo.org> |
11 |
|
12 |
.../amd64/hardened/{stage4.spec => stage4-cloud.spec} | 0 |
13 |
...stage4-nomultilib.spec => stage4-nomultilib-cloud.spec} | 0 |
14 |
.../weekly/specs/amd64/{stage4.spec => stage4-cloud.spec} | 0 |
15 |
...stage4-nomultilib.spec => stage4-nomultilib-cloud.spec} | 0 |
16 |
tools/catalyst-auto-amd64.conf | 14 ++++++++------ |
17 |
5 files changed, 8 insertions(+), 6 deletions(-) |
18 |
|
19 |
diff --git a/releases/weekly/specs/amd64/hardened/stage4.spec b/releases/weekly/specs/amd64/hardened/stage4-cloud.spec |
20 |
similarity index 100% |
21 |
rename from releases/weekly/specs/amd64/hardened/stage4.spec |
22 |
rename to releases/weekly/specs/amd64/hardened/stage4-cloud.spec |
23 |
|
24 |
diff --git a/releases/weekly/specs/amd64/hardened/stage4-nomultilib.spec b/releases/weekly/specs/amd64/hardened/stage4-nomultilib-cloud.spec |
25 |
similarity index 100% |
26 |
rename from releases/weekly/specs/amd64/hardened/stage4-nomultilib.spec |
27 |
rename to releases/weekly/specs/amd64/hardened/stage4-nomultilib-cloud.spec |
28 |
|
29 |
diff --git a/releases/weekly/specs/amd64/stage4.spec b/releases/weekly/specs/amd64/stage4-cloud.spec |
30 |
similarity index 100% |
31 |
rename from releases/weekly/specs/amd64/stage4.spec |
32 |
rename to releases/weekly/specs/amd64/stage4-cloud.spec |
33 |
|
34 |
diff --git a/releases/weekly/specs/amd64/stage4-nomultilib.spec b/releases/weekly/specs/amd64/stage4-nomultilib-cloud.spec |
35 |
similarity index 100% |
36 |
rename from releases/weekly/specs/amd64/stage4-nomultilib.spec |
37 |
rename to releases/weekly/specs/amd64/stage4-nomultilib-cloud.spec |
38 |
|
39 |
diff --git a/tools/catalyst-auto-amd64.conf b/tools/catalyst-auto-amd64.conf |
40 |
index a605ddf..e756acf 100644 |
41 |
--- a/tools/catalyst-auto-amd64.conf |
42 |
+++ b/tools/catalyst-auto-amd64.conf |
43 |
@@ -12,15 +12,17 @@ SPECS_DIR=${REPO_DIR}/releases/weekly/specs/${ARCH} |
44 |
#SETS="multilib nomultilib x32 hardened_multilib hardened_nomultilib hardened_multilib_selinux hardened_nomultilib_selinux" |
45 |
SETS="multilib nomultilib x32 hardened_multilib hardened_nomultilib" |
46 |
|
47 |
-SET_multilib_SPECS="stage1.spec stage2.spec stage3.spec stage4.spec" |
48 |
-SET_multilib_OPTIONAL_SPECS="installcd-stage1.spec installcd-stage2-minimal.spec" |
49 |
-SET_nomultilib_SPECS="stage1-nomultilib.spec stage2-nomultilib.spec stage3-nomultilib.spec stage4-nomultilib.spec" |
50 |
+SET_multilib_SPECS="stage1.spec stage2.spec stage3.spec" |
51 |
+SET_multilib_OPTIONAL_SPECS="installcd-stage1.spec installcd-stage2-minimal.spec stage4.spec" |
52 |
+SET_nomultilib_SPECS="stage1-nomultilib.spec stage2-nomultilib.spec stage3-nomultilib.spec" |
53 |
+SET_nomultilib_OPTIONAL_SPECS="stage4-nomultilib-cloud.spec" |
54 |
|
55 |
SET_x32_SPECS="stage1-x32.spec stage2-x32.spec stage3-x32.spec" |
56 |
|
57 |
-SET_hardened_multilib_SPECS="hardened/stage1.spec hardened/stage2.spec hardened/stage3.spec hardened/stage4.spec" |
58 |
-SET_hardened_multilib_OPTIONAL_SPECS="hardened/admincd-stage1.spec hardened/admincd-stage2.spec" |
59 |
-SET_hardened_nomultilib_SPECS="hardened/stage1-nomultilib.spec hardened/stage2-nomultilib.spec hardened/stage3-nomultilib.spec hardened/stage4-nomultilib.spec" |
60 |
+SET_hardened_multilib_SPECS="hardened/stage1.spec hardened/stage2.spec hardened/stage3.spec" |
61 |
+SET_hardened_multilib_OPTIONAL_SPECS="hardened/admincd-stage1.spec hardened/admincd-stage2.spec hardened/stage4-cloud.spec" |
62 |
+SET_hardened_nomultilib_SPECS="hardened/stage1-nomultilib.spec hardened/stage2-nomultilib.spec hardened/stage3-nomultilib.spec" |
63 |
+SET_hardened_nomultilib_SPECS="hardened/stage4-nomultilib-cloud.spec" |
64 |
|
65 |
SET_hardened_multilib_selinux_SPECS="hardened/stage1-selinux.spec hardened/stage2-selinux.spec hardened/stage3-selinux.spec" |
66 |
SET_hardened_multilib_selinux_OPTIONAL_SPECS="hardened/admincd-stage1-selinux.spec hardened/admincd-stage2-selinux.spec" |