| 1 |
commit: ffbf669d46d0d7ab5fbe7185b2c4ed9fffde549a |
| 2 |
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Jul 3 09:18:13 2022 +0000 |
| 4 |
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Jul 3 09:18:13 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=ffbf669d |
| 7 |
|
| 8 |
Skip stage2 everywhere in amd64 |
| 9 |
|
| 10 |
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org> |
| 11 |
|
| 12 |
.../amd64/hardened-nomultilib-selinux/stage2-openrc.spec | 10 ---------- |
| 13 |
.../amd64/hardened-nomultilib-selinux/stage3-openrc.spec | 2 +- |
| 14 |
releases/specs/amd64/hardened-nomultilib/stage2-openrc.spec | 10 ---------- |
| 15 |
releases/specs/amd64/hardened-nomultilib/stage3-openrc.spec | 2 +- |
| 16 |
releases/specs/amd64/hardened-selinux/stage2-openrc.spec | 10 ---------- |
| 17 |
releases/specs/amd64/hardened-selinux/stage3-openrc.spec | 2 +- |
| 18 |
releases/specs/amd64/hardened/stage2-openrc.spec | 10 ---------- |
| 19 |
releases/specs/amd64/hardened/stage3-openrc.spec | 2 +- |
| 20 |
releases/specs/amd64/musl-hardened/stage2.spec | 11 ----------- |
| 21 |
releases/specs/amd64/musl-hardened/stage3.spec | 2 +- |
| 22 |
tools/catalyst-auto-amd64.conf | 10 +++++----- |
| 23 |
11 files changed, 10 insertions(+), 61 deletions(-) |
| 24 |
|
| 25 |
diff --git a/releases/specs/amd64/hardened-nomultilib-selinux/stage2-openrc.spec b/releases/specs/amd64/hardened-nomultilib-selinux/stage2-openrc.spec |
| 26 |
deleted file mode 100644 |
| 27 |
index 23c1a8ce..00000000 |
| 28 |
--- a/releases/specs/amd64/hardened-nomultilib-selinux/stage2-openrc.spec |
| 29 |
+++ /dev/null |
| 30 |
@@ -1,10 +0,0 @@ |
| 31 |
-subarch: amd64 |
| 32 |
-target: stage2 |
| 33 |
-version_stamp: hardened-nomultilib-selinux-openrc-@TIMESTAMP@ |
| 34 |
-rel_type: hardened |
| 35 |
-profile: default/linux/amd64/17.1/no-multilib/hardened/selinux |
| 36 |
-snapshot: @TIMESTAMP@ |
| 37 |
-source_subpath: hardened/stage1-amd64-hardened-nomultilib-selinux-openrc-@TIMESTAMP@ |
| 38 |
-compression_mode: pixz |
| 39 |
-portage_confdir: @REPO_DIR@/releases/portage/stages |
| 40 |
-portage_prefix: releng |
| 41 |
|
| 42 |
diff --git a/releases/specs/amd64/hardened-nomultilib-selinux/stage3-openrc.spec b/releases/specs/amd64/hardened-nomultilib-selinux/stage3-openrc.spec |
| 43 |
index 8e74a455..bd13f419 100644 |
| 44 |
--- a/releases/specs/amd64/hardened-nomultilib-selinux/stage3-openrc.spec |
| 45 |
+++ b/releases/specs/amd64/hardened-nomultilib-selinux/stage3-openrc.spec |
| 46 |
@@ -4,7 +4,7 @@ version_stamp: hardened-nomultilib-selinux-openrc-@TIMESTAMP@ |
| 47 |
rel_type: hardened |
| 48 |
profile: default/linux/amd64/17.1/no-multilib/hardened/selinux |
| 49 |
snapshot: @TIMESTAMP@ |
| 50 |
-source_subpath: hardened/stage2-amd64-hardened-nomultilib-selinux-openrc-@TIMESTAMP@ |
| 51 |
+source_subpath: hardened/stage1-amd64-hardened-nomultilib-selinux-openrc-@TIMESTAMP@ |
| 52 |
compression_mode: pixz |
| 53 |
portage_confdir: @REPO_DIR@/releases/portage/stages |
| 54 |
portage_prefix: releng |
| 55 |
|
| 56 |
diff --git a/releases/specs/amd64/hardened-nomultilib/stage2-openrc.spec b/releases/specs/amd64/hardened-nomultilib/stage2-openrc.spec |
| 57 |
deleted file mode 100644 |
| 58 |
index 453b5d92..00000000 |
| 59 |
--- a/releases/specs/amd64/hardened-nomultilib/stage2-openrc.spec |
| 60 |
+++ /dev/null |
| 61 |
@@ -1,10 +0,0 @@ |
| 62 |
-subarch: amd64 |
| 63 |
-target: stage2 |
| 64 |
-version_stamp: hardened-nomultilib-openrc-@TIMESTAMP@ |
| 65 |
-rel_type: hardened |
| 66 |
-profile: default/linux/amd64/17.1/no-multilib/hardened |
| 67 |
-snapshot: @TIMESTAMP@ |
| 68 |
-source_subpath: hardened/stage1-amd64-hardened-nomultilib-openrc-@TIMESTAMP@ |
| 69 |
-compression_mode: pixz |
| 70 |
-portage_confdir: @REPO_DIR@/releases/portage/stages |
| 71 |
-portage_prefix: releng |
| 72 |
|
| 73 |
diff --git a/releases/specs/amd64/hardened-nomultilib/stage3-openrc.spec b/releases/specs/amd64/hardened-nomultilib/stage3-openrc.spec |
| 74 |
index 42540e77..7330998a 100644 |
| 75 |
--- a/releases/specs/amd64/hardened-nomultilib/stage3-openrc.spec |
| 76 |
+++ b/releases/specs/amd64/hardened-nomultilib/stage3-openrc.spec |
| 77 |
@@ -4,7 +4,7 @@ version_stamp: hardened-nomultilib-openrc-@TIMESTAMP@ |
| 78 |
rel_type: hardened |
| 79 |
profile: default/linux/amd64/17.1/no-multilib/hardened |
| 80 |
snapshot: @TIMESTAMP@ |
| 81 |
-source_subpath: hardened/stage2-amd64-hardened-nomultilib-openrc-@TIMESTAMP@ |
| 82 |
+source_subpath: hardened/stage1-amd64-hardened-nomultilib-openrc-@TIMESTAMP@ |
| 83 |
compression_mode: pixz |
| 84 |
portage_confdir: @REPO_DIR@/releases/portage/stages |
| 85 |
portage_prefix: releng |
| 86 |
|
| 87 |
diff --git a/releases/specs/amd64/hardened-selinux/stage2-openrc.spec b/releases/specs/amd64/hardened-selinux/stage2-openrc.spec |
| 88 |
deleted file mode 100644 |
| 89 |
index 83d27839..00000000 |
| 90 |
--- a/releases/specs/amd64/hardened-selinux/stage2-openrc.spec |
| 91 |
+++ /dev/null |
| 92 |
@@ -1,10 +0,0 @@ |
| 93 |
-subarch: amd64 |
| 94 |
-target: stage2 |
| 95 |
-version_stamp: hardened-selinux-openrc-@TIMESTAMP@ |
| 96 |
-rel_type: hardened |
| 97 |
-profile: default/linux/amd64/17.1/hardened/selinux |
| 98 |
-snapshot: @TIMESTAMP@ |
| 99 |
-source_subpath: hardened/stage1-amd64-hardened-selinux-openrc-@TIMESTAMP@ |
| 100 |
-compression_mode: pixz |
| 101 |
-portage_confdir: @REPO_DIR@/releases/portage/stages |
| 102 |
-portage_prefix: releng |
| 103 |
|
| 104 |
diff --git a/releases/specs/amd64/hardened-selinux/stage3-openrc.spec b/releases/specs/amd64/hardened-selinux/stage3-openrc.spec |
| 105 |
index f5af19ae..645c830a 100644 |
| 106 |
--- a/releases/specs/amd64/hardened-selinux/stage3-openrc.spec |
| 107 |
+++ b/releases/specs/amd64/hardened-selinux/stage3-openrc.spec |
| 108 |
@@ -4,7 +4,7 @@ version_stamp: hardened-selinux-openrc-@TIMESTAMP@ |
| 109 |
rel_type: hardened |
| 110 |
profile: default/linux/amd64/17.1/hardened/selinux |
| 111 |
snapshot: @TIMESTAMP@ |
| 112 |
-source_subpath: hardened/stage2-amd64-hardened-selinux-openrc-@TIMESTAMP@ |
| 113 |
+source_subpath: hardened/stage1-amd64-hardened-selinux-openrc-@TIMESTAMP@ |
| 114 |
compression_mode: pixz |
| 115 |
portage_confdir: @REPO_DIR@/releases/portage/stages |
| 116 |
portage_prefix: releng |
| 117 |
|
| 118 |
diff --git a/releases/specs/amd64/hardened/stage2-openrc.spec b/releases/specs/amd64/hardened/stage2-openrc.spec |
| 119 |
deleted file mode 100644 |
| 120 |
index 656f4086..00000000 |
| 121 |
--- a/releases/specs/amd64/hardened/stage2-openrc.spec |
| 122 |
+++ /dev/null |
| 123 |
@@ -1,10 +0,0 @@ |
| 124 |
-subarch: amd64 |
| 125 |
-target: stage2 |
| 126 |
-version_stamp: hardened-openrc-@TIMESTAMP@ |
| 127 |
-rel_type: hardened |
| 128 |
-profile: default/linux/amd64/17.1/hardened |
| 129 |
-snapshot: @TIMESTAMP@ |
| 130 |
-source_subpath: hardened/stage1-amd64-hardened-openrc-@TIMESTAMP@ |
| 131 |
-compression_mode: pixz |
| 132 |
-portage_confdir: @REPO_DIR@/releases/portage/stages |
| 133 |
-portage_prefix: releng |
| 134 |
|
| 135 |
diff --git a/releases/specs/amd64/hardened/stage3-openrc.spec b/releases/specs/amd64/hardened/stage3-openrc.spec |
| 136 |
index 925cb430..bf673bde 100644 |
| 137 |
--- a/releases/specs/amd64/hardened/stage3-openrc.spec |
| 138 |
+++ b/releases/specs/amd64/hardened/stage3-openrc.spec |
| 139 |
@@ -4,7 +4,7 @@ version_stamp: hardened-openrc-@TIMESTAMP@ |
| 140 |
rel_type: hardened |
| 141 |
profile: default/linux/amd64/17.1/hardened |
| 142 |
snapshot: @TIMESTAMP@ |
| 143 |
-source_subpath: hardened/stage2-amd64-hardened-openrc-@TIMESTAMP@ |
| 144 |
+source_subpath: hardened/stage1-amd64-hardened-openrc-@TIMESTAMP@ |
| 145 |
compression_mode: pixz |
| 146 |
portage_confdir: @REPO_DIR@/releases/portage/stages |
| 147 |
portage_prefix: releng |
| 148 |
|
| 149 |
diff --git a/releases/specs/amd64/musl-hardened/stage2.spec b/releases/specs/amd64/musl-hardened/stage2.spec |
| 150 |
deleted file mode 100644 |
| 151 |
index 2ffa4f2d..00000000 |
| 152 |
--- a/releases/specs/amd64/musl-hardened/stage2.spec |
| 153 |
+++ /dev/null |
| 154 |
@@ -1,11 +0,0 @@ |
| 155 |
-subarch: amd64 |
| 156 |
-target: stage2 |
| 157 |
-version_stamp: musl-hardened-@TIMESTAMP@ |
| 158 |
-rel_type: musl-hardened |
| 159 |
-profile: default/linux/amd64/17.0/musl/hardened |
| 160 |
-snapshot: @TIMESTAMP@ |
| 161 |
-source_subpath: musl-hardened/stage1-amd64-musl-hardened-@TIMESTAMP@ |
| 162 |
-chost: x86_64-gentoo-linux-musl |
| 163 |
-portage_confdir: @REPO_DIR@/releases/portage/stages |
| 164 |
-portage_prefix: releng |
| 165 |
-compression_mode: pixz |
| 166 |
|
| 167 |
diff --git a/releases/specs/amd64/musl-hardened/stage3.spec b/releases/specs/amd64/musl-hardened/stage3.spec |
| 168 |
index 99a250b8..190ce28c 100644 |
| 169 |
--- a/releases/specs/amd64/musl-hardened/stage3.spec |
| 170 |
+++ b/releases/specs/amd64/musl-hardened/stage3.spec |
| 171 |
@@ -4,7 +4,7 @@ version_stamp: musl-hardened-@TIMESTAMP@ |
| 172 |
rel_type: musl-hardened |
| 173 |
profile: default/linux/amd64/17.0/musl/hardened |
| 174 |
snapshot: @TIMESTAMP@ |
| 175 |
-source_subpath: musl-hardened/stage2-amd64-musl-hardened-@TIMESTAMP@ |
| 176 |
+source_subpath: musl-hardened/stage1-amd64-musl-hardened-@TIMESTAMP@ |
| 177 |
portage_confdir: @REPO_DIR@/releases/portage/stages |
| 178 |
portage_prefix: releng |
| 179 |
compression_mode: pixz |
| 180 |
|
| 181 |
diff --git a/tools/catalyst-auto-amd64.conf b/tools/catalyst-auto-amd64.conf |
| 182 |
index cda07518..c4b0c33a 100644 |
| 183 |
--- a/tools/catalyst-auto-amd64.conf |
| 184 |
+++ b/tools/catalyst-auto-amd64.conf |
| 185 |
@@ -32,21 +32,21 @@ SET_livegui_OPTIONAL_SPECS="livegui/livegui-stage1.spec livegui/livegui-stage2.s |
| 186 |
SET_systemd_SPECS="stage1-systemd.spec stage3-systemd.spec" |
| 187 |
SET_systemd_OPTIONAL_SPECS="stage3d-systemd.spec" |
| 188 |
|
| 189 |
-SET_hardened_openrc_SPECS="hardened/stage1-openrc.spec hardened/stage2-openrc.spec hardened/stage3-openrc.spec" |
| 190 |
+SET_hardened_openrc_SPECS="hardened/stage1-openrc.spec hardened/stage3-openrc.spec" |
| 191 |
SET_hardened_openrc_OPTIONAL_SPECS="hardened/admincd-stage1.spec hardened/admincd-stage2.spec" |
| 192 |
|
| 193 |
-SET_hardened_selinux_openrc_SPECS="hardened-selinux/stage1-openrc.spec hardened-selinux/stage2-openrc.spec hardened-selinux/stage3-openrc.spec" |
| 194 |
+SET_hardened_selinux_openrc_SPECS="hardened-selinux/stage1-openrc.spec hardened-selinux/stage3-openrc.spec" |
| 195 |
|
| 196 |
-SET_hardened_nomultilib_selinux_openrc_SPECS="hardened-nomultilib-selinux/stage1-openrc.spec hardened-nomultilib-selinux/stage2-openrc.spec hardened-nomultilib-selinux/stage3-openrc.spec" |
| 197 |
+SET_hardened_nomultilib_selinux_openrc_SPECS="hardened-nomultilib-selinux/stage1-openrc.spec hardened-nomultilib-selinux/stage3-openrc.spec" |
| 198 |
|
| 199 |
-SET_hardened_nomultilib_openrc_SPECS="hardened-nomultilib/stage1-openrc.spec hardened-nomultilib/stage2-openrc.spec hardened-nomultilib/stage3-openrc.spec" |
| 200 |
+SET_hardened_nomultilib_openrc_SPECS="hardened-nomultilib/stage1-openrc.spec hardened-nomultilib/stage3-openrc.spec" |
| 201 |
|
| 202 |
SET_nomultilib_openrc_SPECS="nomultilib/stage1-openrc.spec nomultilib/stage3-openrc.spec" |
| 203 |
SET_nomultilib_systemd_SPECS="nomultilib/stage1-systemd.spec nomultilib/stage3-systemd.spec" |
| 204 |
|
| 205 |
SET_musl_SPECS="musl/stage1.spec musl/stage3.spec" |
| 206 |
|
| 207 |
-SET_musl_hardened_SPECS="musl-hardened/stage1.spec musl-hardened/stage2.spec musl-hardened/stage3.spec" |
| 208 |
+SET_musl_hardened_SPECS="musl-hardened/stage1.spec musl-hardened/stage3.spec" |
| 209 |
|
| 210 |
SET_x32_openrc_SPECS="x32/stage1-openrc.spec x32/stage3-openrc.spec" |
Archives