commit: 0bf760339650301d5a3ed25fe7de07750b8ba2fa
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 14 23:16:16 2022 +0000
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Mon Mar 14 23:16:16 2022 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=0bf76033
Skip some more amd64 stage2
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
releases/specs/amd64/musl/stage2.spec | 11 -----------
releases/specs/amd64/musl/stage3.spec | 2 +-
releases/specs/amd64/nomultilib/stage2-openrc.spec | 10 ----------
releases/specs/amd64/nomultilib/stage2-systemd.spec | 10 ----------
releases/specs/amd64/nomultilib/stage3-openrc.spec | 2 +-
releases/specs/amd64/nomultilib/stage3-systemd.spec | 2 +-
releases/specs/amd64/x32/stage2-openrc.spec | 10 ----------
releases/specs/amd64/x32/stage3-openrc.spec | 2 +-
tools/catalyst-auto-amd64.conf | 8 ++++----
9 files changed, 8 insertions(+), 49 deletions(-)
diff --git a/releases/specs/amd64/musl/stage2.spec
b/releases/specs/amd64/musl/stage2.spec
deleted file mode 100644
index 4da4b90a..00000000
--- a/releases/specs/amd64/musl/stage2.spec
+++ /dev/null
@@ -1,11 +0,0 @@
-subarch: amd64
-target: stage2
-version_stamp: musl-@TIMESTAMP@
-rel_type: musl
-profile: default/linux/amd64/17.0/musl
-snapshot: @TIMESTAMP@
-source_subpath: musl/stage1-amd64-musl-@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/stage3.spec
b/releases/specs/amd64/musl/stage3.spec
index 9842af11..8b4c18cd 100644
--- a/releases/specs/amd64/musl/stage3.spec
+++ b/releases/specs/amd64/musl/stage3.spec
@@ -4,7 +4,7 @@ version_stamp: musl-@TIMESTAMP@
rel_type: musl
profile: default/linux/amd64/17.0/musl
snapshot: @TIMESTAMP@
-source_subpath: musl/stage2-amd64-musl-@TIMESTAMP@
+source_subpath: musl/stage1-amd64-musl-@TIMESTAMP@
portage_confdir: @REPO_DIR@/releases/portage/stages
portage_prefix: releng
compression_mode: pixz
diff --git a/releases/specs/amd64/nomultilib/stage2-openrc.spec
b/releases/specs/amd64/nomultilib/stage2-openrc.spec
deleted file mode 100644
index ef818b8f..00000000
--- a/releases/specs/amd64/nomultilib/stage2-openrc.spec
+++ /dev/null
@@ -1,10 +0,0 @@
-subarch: amd64
-target: stage2
-version_stamp: nomultilib-openrc-@TIMESTAMP@
-rel_type: default
-profile: default/linux/amd64/17.1/no-multilib
-snapshot: @TIMESTAMP@
-source_subpath: default/stage1-amd64-nomultilib-openrc-@TIMESTAMP@
-compression_mode: pixz
-portage_confdir: @REPO_DIR@/releases/portage/stages
-portage_prefix: releng
diff --git a/releases/specs/amd64/nomultilib/stage2-systemd.spec
b/releases/specs/amd64/nomultilib/stage2-systemd.spec
deleted file mode 100644
index fa473462..00000000
--- a/releases/specs/amd64/nomultilib/stage2-systemd.spec
+++ /dev/null
@@ -1,10 +0,0 @@
-subarch: amd64
-target: stage2
-version_stamp: nomultilib-systemd-@TIMESTAMP@
-rel_type: default
-profile: default/linux/amd64/17.1/no-multilib/systemd
-snapshot: @TIMESTAMP@
-source_subpath: default/stage1-amd64-nomultilib-systemd-@TIMESTAMP@
-compression_mode: pixz
-portage_confdir: @REPO_DIR@/releases/portage/stages
-portage_prefix: releng
diff --git a/releases/specs/amd64/nomultilib/stage3-openrc.spec
b/releases/specs/amd64/nomultilib/stage3-openrc.spec
index a4e4d7c3..dc48e664 100644
--- a/releases/specs/amd64/nomultilib/stage3-openrc.spec
+++ b/releases/specs/amd64/nomultilib/stage3-openrc.spec
@@ -4,7 +4,7 @@ version_stamp: nomultilib-openrc-@TIMESTAMP@
rel_type: default
profile: default/linux/amd64/17.1/no-multilib
snapshot: @TIMESTAMP@
-source_subpath: default/stage2-amd64-nomultilib-openrc-@TIMESTAMP@
+source_subpath: default/stage1-amd64-nomultilib-openrc-@TIMESTAMP@
compression_mode: pixz
portage_confdir: @REPO_DIR@/releases/portage/stages
portage_prefix: releng
diff --git a/releases/specs/amd64/nomultilib/stage3-systemd.spec
b/releases/specs/amd64/nomultilib/stage3-systemd.spec
index 6e179c82..aed71f8d 100644
--- a/releases/specs/amd64/nomultilib/stage3-systemd.spec
+++ b/releases/specs/amd64/nomultilib/stage3-systemd.spec
@@ -4,7 +4,7 @@ version_stamp: nomultilib-systemd-@TIMESTAMP@
rel_type: default
profile: default/linux/amd64/17.1/no-multilib/systemd
snapshot: @TIMESTAMP@
-source_subpath: default/stage2-amd64-nomultilib-systemd-@TIMESTAMP@
+source_subpath: default/stage1-amd64-nomultilib-systemd-@TIMESTAMP@
compression_mode: pixz
portage_confdir: @REPO_DIR@/releases/portage/stages
portage_prefix: releng
diff --git a/releases/specs/amd64/x32/stage2-openrc.spec
b/releases/specs/amd64/x32/stage2-openrc.spec
deleted file mode 100644
index c9abbf84..00000000
--- a/releases/specs/amd64/x32/stage2-openrc.spec
+++ /dev/null
@@ -1,10 +0,0 @@
-subarch: x32
-target: stage2
-version_stamp: openrc-@TIMESTAMP@
-rel_type: default
-profile: default/linux/amd64/17.0/x32
-snapshot: @TIMESTAMP@
-source_subpath: default/stage1-x32-openrc-@TIMESTAMP@
-compression_mode: pixz
-portage_confdir: @REPO_DIR@/releases/portage/stages
-portage_prefix: releng
diff --git a/releases/specs/amd64/x32/stage3-openrc.spec
b/releases/specs/amd64/x32/stage3-openrc.spec
index a26da8d9..aa82f8b1 100644
--- a/releases/specs/amd64/x32/stage3-openrc.spec
+++ b/releases/specs/amd64/x32/stage3-openrc.spec
@@ -4,7 +4,7 @@ version_stamp: openrc-@TIMESTAMP@
rel_type: default
profile: default/linux/amd64/17.0/x32
snapshot: @TIMESTAMP@
-source_subpath: default/stage2-x32-openrc-@TIMESTAMP@
+source_subpath: default/stage1-x32-openrc-@TIMESTAMP@
compression_mode: pixz
portage_confdir: @REPO_DIR@/releases/portage/stages
portage_prefix: releng
diff --git a/tools/catalyst-auto-amd64.conf b/tools/catalyst-auto-amd64.conf
index e4882343..cda07518 100644
--- a/tools/catalyst-auto-amd64.conf
+++ b/tools/catalyst-auto-amd64.conf
@@ -41,14 +41,14 @@
SET_hardened_nomultilib_selinux_openrc_SPECS="hardened-nomultilib-selinux/stage1
SET_hardened_nomultilib_openrc_SPECS="hardened-nomultilib/stage1-openrc.spec
hardened-nomultilib/stage2-openrc.spec hardened-nomultilib/stage3-openrc.spec"
-SET_nomultilib_openrc_SPECS="nomultilib/stage1-openrc.spec
nomultilib/stage2-openrc.spec nomultilib/stage3-openrc.spec"
-SET_nomultilib_systemd_SPECS="nomultilib/stage1-systemd.spec
nomultilib/stage2-systemd.spec nomultilib/stage3-systemd.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/stage2.spec musl/stage3.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_x32_openrc_SPECS="x32/stage1-openrc.spec x32/stage2-openrc.spec
x32/stage3-openrc.spec"
+SET_x32_openrc_SPECS="x32/stage1-openrc.spec x32/stage3-openrc.spec"
KCONFIG_DIR=${REPO_DIR}/releases/kconfig/amd64
