Skip stage2 everywhere in x86

Signed-off-by: Andreas K. Hüttel <dilfridge@gentoo.org>

10 files changed, 5 insertions, 56 deletions

diff --git a/releases/specs/x86/hardened/stage2-openrc.spec b/releases/specs/x86/hardened/stage2-openrc.spec
deleted file mode 100644
index 04b9165b..00000000
--- a/releases/specs/x86/hardened/stage2-openrc.spec
+++ /dev/null
@@ -1,10 +0,0 @@
-subarch: i686
-target: stage2
-version_stamp: hardened-openrc-@TIMESTAMP@
-rel_type: hardened
-profile: default/linux/x86/17.0/hardened
-snapshot: @TIMESTAMP@
-source_subpath: hardened/stage1-i686-hardened-openrc-@TIMESTAMP@
-compression_mode: pixz
-portage_confdir: @REPO_DIR@/releases/portage/stages
-portage_prefix: releng
diff --git a/releases/specs/x86/hardened/stage3-openrc.spec b/releases/specs/x86/hardened/stage3-openrc.spec
index 4a7a7c3c..71edc070 100644
--- a/releases/specs/x86/hardened/stage3-openrc.spec
+++ b/releases/specs/x86/hardened/stage3-openrc.spec
@@ -4,7 +4,7 @@ version_stamp: hardened-openrc-@TIMESTAMP@
 rel_type: hardened
 profile: default/linux/x86/17.0/hardened
 snapshot: @TIMESTAMP@
-source_subpath: hardened/stage2-i686-hardened-openrc-@TIMESTAMP@
+source_subpath: hardened/stage1-i686-hardened-openrc-@TIMESTAMP@
 compression_mode: pixz
 portage_confdir: @REPO_DIR@/releases/portage/stages
 portage_prefix: releng
diff --git a/releases/specs/x86/i486/stage2-openrc.spec b/releases/specs/x86/i486/stage2-openrc.spec
deleted file mode 100644
index 24f6716e..00000000
--- a/releases/specs/x86/i486/stage2-openrc.spec
+++ /dev/null
@@ -1,10 +0,0 @@
-subarch: i486
-target: stage2
-version_stamp: openrc-@TIMESTAMP@
-rel_type: default
-profile: default/linux/x86/17.0
-snapshot: @TIMESTAMP@
-source_subpath: default/stage1-i486-openrc-@TIMESTAMP@
-compression_mode: pixz
-portage_confdir: @REPO_DIR@/releases/portage/stages
-portage_prefix: releng
diff --git a/releases/specs/x86/i486/stage3-openrc.spec b/releases/specs/x86/i486/stage3-openrc.spec
index a46f0b7a..cec01b2e 100644
--- a/releases/specs/x86/i486/stage3-openrc.spec
+++ b/releases/specs/x86/i486/stage3-openrc.spec
@@ -4,7 +4,7 @@ version_stamp: openrc-@TIMESTAMP@
 rel_type: default
 profile: default/linux/x86/17.0
 snapshot: @TIMESTAMP@
-source_subpath: default/stage2-i486-openrc-@TIMESTAMP@
+source_subpath: default/stage1-i486-openrc-@TIMESTAMP@
 compression_mode: pixz
 portage_confdir: @REPO_DIR@/releases/portage/stages
 portage_prefix: releng
diff --git a/releases/specs/x86/i686/stage2-openrc.spec b/releases/specs/x86/i686/stage2-openrc.spec
deleted file mode 100644
index 2ed163e2..00000000
--- a/releases/specs/x86/i686/stage2-openrc.spec
+++ /dev/null
@@ -1,10 +0,0 @@
-subarch: i686
-target: stage2
-version_stamp: openrc-@TIMESTAMP@
-rel_type: default
-profile: default/linux/x86/17.0
-snapshot: @TIMESTAMP@
-source_subpath: default/stage1-i686-openrc-@TIMESTAMP@
-compression_mode: pixz
-portage_confdir: @REPO_DIR@/releases/portage/stages
-portage_prefix: releng
diff --git a/releases/specs/x86/i686/stage2-systemd.spec b/releases/specs/x86/i686/stage2-systemd.spec
deleted file mode 100644
index 02c90ae7..00000000
--- a/releases/specs/x86/i686/stage2-systemd.spec
+++ /dev/null
@@ -1,10 +0,0 @@
-subarch: i686
-target: stage2
-version_stamp: systemd-@TIMESTAMP@
-rel_type: default
-profile: default/linux/x86/17.0/systemd
-snapshot: @TIMESTAMP@
-source_subpath: default/stage1-i686-systemd-@TIMESTAMP@
-compression_mode: pixz
-portage_confdir: @REPO_DIR@/releases/portage/stages
-portage_prefix: releng
diff --git a/releases/specs/x86/i686/stage3-openrc.spec b/releases/specs/x86/i686/stage3-openrc.spec
index 2526c37a..84ee1ba0 100644
--- a/releases/specs/x86/i686/stage3-openrc.spec
+++ b/releases/specs/x86/i686/stage3-openrc.spec
@@ -4,7 +4,7 @@ version_stamp: openrc-@TIMESTAMP@
 rel_type: default
 profile: default/linux/x86/17.0
 snapshot: @TIMESTAMP@
-source_subpath: default/stage2-i686-openrc-@TIMESTAMP@
+source_subpath: default/stage1-i686-openrc-@TIMESTAMP@
 compression_mode: pixz
 portage_confdir: @REPO_DIR@/releases/portage/stages
 portage_prefix: releng
diff --git a/releases/specs/x86/i686/stage3-systemd.spec b/releases/specs/x86/i686/stage3-systemd.spec
index d6824486..a6d8952c 100644
--- a/releases/specs/x86/i686/stage3-systemd.spec
+++ b/releases/specs/x86/i686/stage3-systemd.spec
@@ -4,7 +4,7 @@ version_stamp: systemd-@TIMESTAMP@
 rel_type: default
 profile: default/linux/x86/17.0/systemd
 snapshot: @TIMESTAMP@
-source_subpath: default/stage2-i686-systemd-@TIMESTAMP@
+source_subpath: default/stage1-i686-systemd-@TIMESTAMP@
 compression_mode: pixz
 portage_confdir: @REPO_DIR@/releases/portage/stages
 portage_prefix: releng
diff --git a/releases/specs/x86/musl/stage2.spec b/releases/specs/x86/musl/stage2.spec
deleted file mode 100644
index f502721c..00000000
--- a/releases/specs/x86/musl/stage2.spec
+++ /dev/null
@@ -1,11 +0,0 @@
-subarch: i686
-target: stage2
-version_stamp: musl-@TIMESTAMP@
-rel_type: musl
-profile: default/linux/x86/17.0/musl
-snapshot: @TIMESTAMP@
-source_subpath: musl/stage1-i686-musl-@TIMESTAMP@
-chost: i686-gentoo-linux-musl
-portage_confdir: @REPO_DIR@/releases/portage/stages
-portage_prefix: releng
-compression_mode: pixz
diff --git a/releases/specs/x86/musl/stage3.spec b/releases/specs/x86/musl/stage3.spec
index 63c315bf..284babfd 100644
--- a/releases/specs/x86/musl/stage3.spec
+++ b/releases/specs/x86/musl/stage3.spec
@@ -4,7 +4,7 @@ version_stamp: musl-@TIMESTAMP@
 rel_type: musl
 profile: default/linux/x86/17.0/musl
 snapshot: @TIMESTAMP@
-source_subpath: musl/stage2-i686-musl-@TIMESTAMP@
+source_subpath: musl/stage1-i686-musl-@TIMESTAMP@
 portage_confdir: @REPO_DIR@/releases/portage/stages
 portage_prefix: releng
 compression_mode: pixz