commit:     11ccab53f87da4c49d3080fcca2bf9677cf5cffd
Author:     Matthew Thode <mthode <AT> mthode <DOT> org>
AuthorDate: Sun Feb  4 23:05:20 2018 +0000
Commit:     Matt Thode <prometheanfire <AT> gentoo <DOT> org>
CommitDate: Sun Feb  4 23:06:42 2018 +0000
URL:        https://gitweb.gentoo.org/proj/releng.git/commit/?id=11ccab53

move stage4 build integration stages into a subdir

 .../specs/amd64/hardened/{ => image-building}/stage4-minimal.spec | 0
 .../hardened/{ => image-building}/stage4-nomultilib-minimal.spec  | 0
 .../weekly/specs/amd64/{ => image-building}/stage4-minimal.spec   | 0
 .../amd64/{ => image-building}/stage4-nomultilib-minimal.spec     | 0
 tools/catalyst-auto-amd64.conf                                    | 8 ++++----
 5 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/releases/weekly/specs/amd64/hardened/stage4-minimal.spec 
b/releases/weekly/specs/amd64/hardened/image-building/stage4-minimal.spec
similarity index 100%
rename from releases/weekly/specs/amd64/hardened/stage4-minimal.spec
rename to 
releases/weekly/specs/amd64/hardened/image-building/stage4-minimal.spec

diff --git 
a/releases/weekly/specs/amd64/hardened/stage4-nomultilib-minimal.spec 
b/releases/weekly/specs/amd64/hardened/image-building/stage4-nomultilib-minimal.spec
similarity index 100%
rename from releases/weekly/specs/amd64/hardened/stage4-nomultilib-minimal.spec
rename to 
releases/weekly/specs/amd64/hardened/image-building/stage4-nomultilib-minimal.spec

diff --git a/releases/weekly/specs/amd64/stage4-minimal.spec 
b/releases/weekly/specs/amd64/image-building/stage4-minimal.spec
similarity index 100%
rename from releases/weekly/specs/amd64/stage4-minimal.spec
rename to releases/weekly/specs/amd64/image-building/stage4-minimal.spec

diff --git a/releases/weekly/specs/amd64/stage4-nomultilib-minimal.spec 
b/releases/weekly/specs/amd64/image-building/stage4-nomultilib-minimal.spec
similarity index 100%
rename from releases/weekly/specs/amd64/stage4-nomultilib-minimal.spec
rename to 
releases/weekly/specs/amd64/image-building/stage4-nomultilib-minimal.spec

diff --git a/tools/catalyst-auto-amd64.conf b/tools/catalyst-auto-amd64.conf
index e469a487..d999e4b7 100644
--- a/tools/catalyst-auto-amd64.conf
+++ b/tools/catalyst-auto-amd64.conf
@@ -21,9 +21,9 @@ SETS="
 
 SET_multilib_SPECS="stage1.spec stage2.spec stage3.spec"
 SET_multilib_OPTIONAL_SPECS="installcd-stage1.spec 
installcd-stage2-minimal.spec"
-SET_minimal_multilib_OPTIONAL_SPECS="stage4-minimal.spec"
+SET_minimal_multilib_OPTIONAL_SPECS="image-building/stage4-minimal.spec"
 SET_nomultilib_SPECS="stage1-nomultilib.spec stage2-nomultilib.spec 
stage3-nomultilib.spec"
-SET_minimal_nomultilib_OPTIONAL_SPECS="stage4-nomultilib-minimal.spec"
+SET_minimal_nomultilib_OPTIONAL_SPECS="image-building/stage4-nomultilib-minimal.spec"
 
 SET_x32_SPECS="stage1-x32.spec stage2-x32.spec stage3-x32.spec"
 
@@ -32,9 +32,9 @@ SET_systemd_OPTIONAL_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_minimal_hardened_multilib_OPTIONAL_SPECS="hardened/stage4-minimal.spec"
+SET_minimal_hardened_multilib_OPTIONAL_SPECS="hardened/image-building/stage4-minimal.spec"
 SET_hardened_nomultilib_SPECS="hardened/stage1-nomultilib.spec 
hardened/stage2-nomultilib.spec hardened/stage3-nomultilib.spec"
-SET_minimal_hardened_nomultilib_OPTIONAL_SPECS="hardened/stage4-nomultilib-minimal.spec"
+SET_minimal_hardened_nomultilib_OPTIONAL_SPECS="hardened/image-building/stage4-nomultilib-minimal.spec"
 
 SET_hardened_multilib_selinux_SPECS="hardened/stage1-selinux.spec 
hardened/stage2-selinux.spec hardened/stage3-selinux.spec"
 
SET_hardened_multilib_selinux_OPTIONAL_SPECS="hardened/admincd-stage1-selinux.spec
 hardened/admincd-stage2-selinux.spec"

Reply via email to