commit: ffbf669d46d0d7ab5fbe7185b2c4ed9fffde549a Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org> AuthorDate: Sun Jul 3 09:18:13 2022 +0000 Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org> CommitDate: Sun Jul 3 09:18:13 2022 +0000 URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=ffbf669d
Skip stage2 everywhere in amd64 Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org> .../amd64/hardened-nomultilib-selinux/stage2-openrc.spec | 10 ---------- .../amd64/hardened-nomultilib-selinux/stage3-openrc.spec | 2 +- releases/specs/amd64/hardened-nomultilib/stage2-openrc.spec | 10 ---------- releases/specs/amd64/hardened-nomultilib/stage3-openrc.spec | 2 +- releases/specs/amd64/hardened-selinux/stage2-openrc.spec | 10 ---------- releases/specs/amd64/hardened-selinux/stage3-openrc.spec | 2 +- releases/specs/amd64/hardened/stage2-openrc.spec | 10 ---------- releases/specs/amd64/hardened/stage3-openrc.spec | 2 +- releases/specs/amd64/musl-hardened/stage2.spec | 11 ----------- releases/specs/amd64/musl-hardened/stage3.spec | 2 +- tools/catalyst-auto-amd64.conf | 10 +++++----- 11 files changed, 10 insertions(+), 61 deletions(-) diff --git a/releases/specs/amd64/hardened-nomultilib-selinux/stage2-openrc.spec b/releases/specs/amd64/hardened-nomultilib-selinux/stage2-openrc.spec deleted file mode 100644 index 23c1a8ce..00000000 --- a/releases/specs/amd64/hardened-nomultilib-selinux/stage2-openrc.spec +++ /dev/null @@ -1,10 +0,0 @@ -subarch: amd64 -target: stage2 -version_stamp: hardened-nomultilib-selinux-openrc-@TIMESTAMP@ -rel_type: hardened -profile: default/linux/amd64/17.1/no-multilib/hardened/selinux -snapshot: @TIMESTAMP@ -source_subpath: hardened/stage1-amd64-hardened-nomultilib-selinux-openrc-@TIMESTAMP@ -compression_mode: pixz -portage_confdir: @REPO_DIR@/releases/portage/stages -portage_prefix: releng diff --git a/releases/specs/amd64/hardened-nomultilib-selinux/stage3-openrc.spec b/releases/specs/amd64/hardened-nomultilib-selinux/stage3-openrc.spec index 8e74a455..bd13f419 100644 --- a/releases/specs/amd64/hardened-nomultilib-selinux/stage3-openrc.spec +++ b/releases/specs/amd64/hardened-nomultilib-selinux/stage3-openrc.spec @@ -4,7 +4,7 @@ version_stamp: hardened-nomultilib-selinux-openrc-@TIMESTAMP@ rel_type: hardened profile: default/linux/amd64/17.1/no-multilib/hardened/selinux snapshot: @TIMESTAMP@ -source_subpath: hardened/stage2-amd64-hardened-nomultilib-selinux-openrc-@TIMESTAMP@ +source_subpath: hardened/stage1-amd64-hardened-nomultilib-selinux-openrc-@TIMESTAMP@ compression_mode: pixz portage_confdir: @REPO_DIR@/releases/portage/stages portage_prefix: releng diff --git a/releases/specs/amd64/hardened-nomultilib/stage2-openrc.spec b/releases/specs/amd64/hardened-nomultilib/stage2-openrc.spec deleted file mode 100644 index 453b5d92..00000000 --- a/releases/specs/amd64/hardened-nomultilib/stage2-openrc.spec +++ /dev/null @@ -1,10 +0,0 @@ -subarch: amd64 -target: stage2 -version_stamp: hardened-nomultilib-openrc-@TIMESTAMP@ -rel_type: hardened -profile: default/linux/amd64/17.1/no-multilib/hardened -snapshot: @TIMESTAMP@ -source_subpath: hardened/stage1-amd64-hardened-nomultilib-openrc-@TIMESTAMP@ -compression_mode: pixz -portage_confdir: @REPO_DIR@/releases/portage/stages -portage_prefix: releng diff --git a/releases/specs/amd64/hardened-nomultilib/stage3-openrc.spec b/releases/specs/amd64/hardened-nomultilib/stage3-openrc.spec index 42540e77..7330998a 100644 --- a/releases/specs/amd64/hardened-nomultilib/stage3-openrc.spec +++ b/releases/specs/amd64/hardened-nomultilib/stage3-openrc.spec @@ -4,7 +4,7 @@ version_stamp: hardened-nomultilib-openrc-@TIMESTAMP@ rel_type: hardened profile: default/linux/amd64/17.1/no-multilib/hardened snapshot: @TIMESTAMP@ -source_subpath: hardened/stage2-amd64-hardened-nomultilib-openrc-@TIMESTAMP@ +source_subpath: hardened/stage1-amd64-hardened-nomultilib-openrc-@TIMESTAMP@ compression_mode: pixz portage_confdir: @REPO_DIR@/releases/portage/stages portage_prefix: releng diff --git a/releases/specs/amd64/hardened-selinux/stage2-openrc.spec b/releases/specs/amd64/hardened-selinux/stage2-openrc.spec deleted file mode 100644 index 83d27839..00000000 --- a/releases/specs/amd64/hardened-selinux/stage2-openrc.spec +++ /dev/null @@ -1,10 +0,0 @@ -subarch: amd64 -target: stage2 -version_stamp: hardened-selinux-openrc-@TIMESTAMP@ -rel_type: hardened -profile: default/linux/amd64/17.1/hardened/selinux -snapshot: @TIMESTAMP@ -source_subpath: hardened/stage1-amd64-hardened-selinux-openrc-@TIMESTAMP@ -compression_mode: pixz -portage_confdir: @REPO_DIR@/releases/portage/stages -portage_prefix: releng diff --git a/releases/specs/amd64/hardened-selinux/stage3-openrc.spec b/releases/specs/amd64/hardened-selinux/stage3-openrc.spec index f5af19ae..645c830a 100644 --- a/releases/specs/amd64/hardened-selinux/stage3-openrc.spec +++ b/releases/specs/amd64/hardened-selinux/stage3-openrc.spec @@ -4,7 +4,7 @@ version_stamp: hardened-selinux-openrc-@TIMESTAMP@ rel_type: hardened profile: default/linux/amd64/17.1/hardened/selinux snapshot: @TIMESTAMP@ -source_subpath: hardened/stage2-amd64-hardened-selinux-openrc-@TIMESTAMP@ +source_subpath: hardened/stage1-amd64-hardened-selinux-openrc-@TIMESTAMP@ compression_mode: pixz portage_confdir: @REPO_DIR@/releases/portage/stages portage_prefix: releng diff --git a/releases/specs/amd64/hardened/stage2-openrc.spec b/releases/specs/amd64/hardened/stage2-openrc.spec deleted file mode 100644 index 656f4086..00000000 --- a/releases/specs/amd64/hardened/stage2-openrc.spec +++ /dev/null @@ -1,10 +0,0 @@ -subarch: amd64 -target: stage2 -version_stamp: hardened-openrc-@TIMESTAMP@ -rel_type: hardened -profile: default/linux/amd64/17.1/hardened -snapshot: @TIMESTAMP@ -source_subpath: hardened/stage1-amd64-hardened-openrc-@TIMESTAMP@ -compression_mode: pixz -portage_confdir: @REPO_DIR@/releases/portage/stages -portage_prefix: releng diff --git a/releases/specs/amd64/hardened/stage3-openrc.spec b/releases/specs/amd64/hardened/stage3-openrc.spec index 925cb430..bf673bde 100644 --- a/releases/specs/amd64/hardened/stage3-openrc.spec +++ b/releases/specs/amd64/hardened/stage3-openrc.spec @@ -4,7 +4,7 @@ version_stamp: hardened-openrc-@TIMESTAMP@ rel_type: hardened profile: default/linux/amd64/17.1/hardened snapshot: @TIMESTAMP@ -source_subpath: hardened/stage2-amd64-hardened-openrc-@TIMESTAMP@ +source_subpath: hardened/stage1-amd64-hardened-openrc-@TIMESTAMP@ compression_mode: pixz portage_confdir: @REPO_DIR@/releases/portage/stages portage_prefix: releng diff --git a/releases/specs/amd64/musl-hardened/stage2.spec b/releases/specs/amd64/musl-hardened/stage2.spec deleted file mode 100644 index 2ffa4f2d..00000000 --- a/releases/specs/amd64/musl-hardened/stage2.spec +++ /dev/null @@ -1,11 +0,0 @@ -subarch: amd64 -target: stage2 -version_stamp: musl-hardened-@TIMESTAMP@ -rel_type: musl-hardened -profile: default/linux/amd64/17.0/musl/hardened -snapshot: @TIMESTAMP@ -source_subpath: musl-hardened/stage1-amd64-musl-hardened-@TIMESTAMP@ -chost: x86_64-gentoo-linux-musl -portage_confdir: @REPO_DIR@/releases/portage/stages -portage_prefix: releng -compression_mode: pixz diff --git a/releases/specs/amd64/musl-hardened/stage3.spec b/releases/specs/amd64/musl-hardened/stage3.spec index 99a250b8..190ce28c 100644 --- a/releases/specs/amd64/musl-hardened/stage3.spec +++ b/releases/specs/amd64/musl-hardened/stage3.spec @@ -4,7 +4,7 @@ version_stamp: musl-hardened-@TIMESTAMP@ rel_type: musl-hardened profile: default/linux/amd64/17.0/musl/hardened snapshot: @TIMESTAMP@ -source_subpath: musl-hardened/stage2-amd64-musl-hardened-@TIMESTAMP@ +source_subpath: musl-hardened/stage1-amd64-musl-hardened-@TIMESTAMP@ portage_confdir: @REPO_DIR@/releases/portage/stages portage_prefix: releng compression_mode: pixz diff --git a/tools/catalyst-auto-amd64.conf b/tools/catalyst-auto-amd64.conf index cda07518..c4b0c33a 100644 --- a/tools/catalyst-auto-amd64.conf +++ b/tools/catalyst-auto-amd64.conf @@ -32,21 +32,21 @@ SET_livegui_OPTIONAL_SPECS="livegui/livegui-stage1.spec livegui/livegui-stage2.s SET_systemd_SPECS="stage1-systemd.spec stage3-systemd.spec" SET_systemd_OPTIONAL_SPECS="stage3d-systemd.spec" -SET_hardened_openrc_SPECS="hardened/stage1-openrc.spec hardened/stage2-openrc.spec hardened/stage3-openrc.spec" +SET_hardened_openrc_SPECS="hardened/stage1-openrc.spec hardened/stage3-openrc.spec" SET_hardened_openrc_OPTIONAL_SPECS="hardened/admincd-stage1.spec hardened/admincd-stage2.spec" -SET_hardened_selinux_openrc_SPECS="hardened-selinux/stage1-openrc.spec hardened-selinux/stage2-openrc.spec hardened-selinux/stage3-openrc.spec" +SET_hardened_selinux_openrc_SPECS="hardened-selinux/stage1-openrc.spec hardened-selinux/stage3-openrc.spec" -SET_hardened_nomultilib_selinux_openrc_SPECS="hardened-nomultilib-selinux/stage1-openrc.spec hardened-nomultilib-selinux/stage2-openrc.spec hardened-nomultilib-selinux/stage3-openrc.spec" +SET_hardened_nomultilib_selinux_openrc_SPECS="hardened-nomultilib-selinux/stage1-openrc.spec hardened-nomultilib-selinux/stage3-openrc.spec" -SET_hardened_nomultilib_openrc_SPECS="hardened-nomultilib/stage1-openrc.spec hardened-nomultilib/stage2-openrc.spec hardened-nomultilib/stage3-openrc.spec" +SET_hardened_nomultilib_openrc_SPECS="hardened-nomultilib/stage1-openrc.spec hardened-nomultilib/stage3-openrc.spec" SET_nomultilib_openrc_SPECS="nomultilib/stage1-openrc.spec nomultilib/stage3-openrc.spec" SET_nomultilib_systemd_SPECS="nomultilib/stage1-systemd.spec nomultilib/stage3-systemd.spec" SET_musl_SPECS="musl/stage1.spec musl/stage3.spec" -SET_musl_hardened_SPECS="musl-hardened/stage1.spec musl-hardened/stage2.spec musl-hardened/stage3.spec" +SET_musl_hardened_SPECS="musl-hardened/stage1.spec musl-hardened/stage3.spec" SET_x32_openrc_SPECS="x32/stage1-openrc.spec x32/stage3-openrc.spec"
