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