| 1 |
commit: 11ccab53f87da4c49d3080fcca2bf9677cf5cffd |
| 2 |
Author: Matthew Thode <mthode <AT> mthode <DOT> org> |
| 3 |
AuthorDate: Sun Feb 4 23:05:20 2018 +0000 |
| 4 |
Commit: Matt Thode <prometheanfire <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Feb 4 23:06:42 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=11ccab53 |
| 7 |
|
| 8 |
move stage4 build integration stages into a subdir |
| 9 |
|
| 10 |
.../specs/amd64/hardened/{ => image-building}/stage4-minimal.spec | 0 |
| 11 |
.../hardened/{ => image-building}/stage4-nomultilib-minimal.spec | 0 |
| 12 |
.../weekly/specs/amd64/{ => image-building}/stage4-minimal.spec | 0 |
| 13 |
.../amd64/{ => image-building}/stage4-nomultilib-minimal.spec | 0 |
| 14 |
tools/catalyst-auto-amd64.conf | 8 ++++---- |
| 15 |
5 files changed, 4 insertions(+), 4 deletions(-) |
| 16 |
|
| 17 |
diff --git a/releases/weekly/specs/amd64/hardened/stage4-minimal.spec b/releases/weekly/specs/amd64/hardened/image-building/stage4-minimal.spec |
| 18 |
similarity index 100% |
| 19 |
rename from releases/weekly/specs/amd64/hardened/stage4-minimal.spec |
| 20 |
rename to releases/weekly/specs/amd64/hardened/image-building/stage4-minimal.spec |
| 21 |
|
| 22 |
diff --git a/releases/weekly/specs/amd64/hardened/stage4-nomultilib-minimal.spec b/releases/weekly/specs/amd64/hardened/image-building/stage4-nomultilib-minimal.spec |
| 23 |
similarity index 100% |
| 24 |
rename from releases/weekly/specs/amd64/hardened/stage4-nomultilib-minimal.spec |
| 25 |
rename to releases/weekly/specs/amd64/hardened/image-building/stage4-nomultilib-minimal.spec |
| 26 |
|
| 27 |
diff --git a/releases/weekly/specs/amd64/stage4-minimal.spec b/releases/weekly/specs/amd64/image-building/stage4-minimal.spec |
| 28 |
similarity index 100% |
| 29 |
rename from releases/weekly/specs/amd64/stage4-minimal.spec |
| 30 |
rename to releases/weekly/specs/amd64/image-building/stage4-minimal.spec |
| 31 |
|
| 32 |
diff --git a/releases/weekly/specs/amd64/stage4-nomultilib-minimal.spec b/releases/weekly/specs/amd64/image-building/stage4-nomultilib-minimal.spec |
| 33 |
similarity index 100% |
| 34 |
rename from releases/weekly/specs/amd64/stage4-nomultilib-minimal.spec |
| 35 |
rename to releases/weekly/specs/amd64/image-building/stage4-nomultilib-minimal.spec |
| 36 |
|
| 37 |
diff --git a/tools/catalyst-auto-amd64.conf b/tools/catalyst-auto-amd64.conf |
| 38 |
index e469a487..d999e4b7 100644 |
| 39 |
--- a/tools/catalyst-auto-amd64.conf |
| 40 |
+++ b/tools/catalyst-auto-amd64.conf |
| 41 |
@@ -21,9 +21,9 @@ SETS=" |
| 42 |
|
| 43 |
SET_multilib_SPECS="stage1.spec stage2.spec stage3.spec" |
| 44 |
SET_multilib_OPTIONAL_SPECS="installcd-stage1.spec installcd-stage2-minimal.spec" |
| 45 |
-SET_minimal_multilib_OPTIONAL_SPECS="stage4-minimal.spec" |
| 46 |
+SET_minimal_multilib_OPTIONAL_SPECS="image-building/stage4-minimal.spec" |
| 47 |
SET_nomultilib_SPECS="stage1-nomultilib.spec stage2-nomultilib.spec stage3-nomultilib.spec" |
| 48 |
-SET_minimal_nomultilib_OPTIONAL_SPECS="stage4-nomultilib-minimal.spec" |
| 49 |
+SET_minimal_nomultilib_OPTIONAL_SPECS="image-building/stage4-nomultilib-minimal.spec" |
| 50 |
|
| 51 |
SET_x32_SPECS="stage1-x32.spec stage2-x32.spec stage3-x32.spec" |
| 52 |
|
| 53 |
@@ -32,9 +32,9 @@ SET_systemd_OPTIONAL_SPECS="stage4-systemd.spec" |
| 54 |
|
| 55 |
SET_hardened_multilib_SPECS="hardened/stage1.spec hardened/stage2.spec hardened/stage3.spec" |
| 56 |
SET_hardened_multilib_OPTIONAL_SPECS="hardened/admincd-stage1.spec hardened/admincd-stage2.spec" |
| 57 |
-SET_minimal_hardened_multilib_OPTIONAL_SPECS="hardened/stage4-minimal.spec" |
| 58 |
+SET_minimal_hardened_multilib_OPTIONAL_SPECS="hardened/image-building/stage4-minimal.spec" |
| 59 |
SET_hardened_nomultilib_SPECS="hardened/stage1-nomultilib.spec hardened/stage2-nomultilib.spec hardened/stage3-nomultilib.spec" |
| 60 |
-SET_minimal_hardened_nomultilib_OPTIONAL_SPECS="hardened/stage4-nomultilib-minimal.spec" |
| 61 |
+SET_minimal_hardened_nomultilib_OPTIONAL_SPECS="hardened/image-building/stage4-nomultilib-minimal.spec" |
| 62 |
|
| 63 |
SET_hardened_multilib_selinux_SPECS="hardened/stage1-selinux.spec hardened/stage2-selinux.spec hardened/stage3-selinux.spec" |
| 64 |
SET_hardened_multilib_selinux_OPTIONAL_SPECS="hardened/admincd-stage1-selinux.spec hardened/admincd-stage2-selinux.spec" |
Archives