* [gentoo-commits] proj/releng:master commit in: releases/specs/x86/i686/, releases/specs/x86/hardened/, tools/, ...
@ 2022-07-03 11:18 Andreas K. Hüttel
0 siblings, 0 replies; only message in thread
From: Andreas K. Hüttel @ 2022-07-03 11:18 UTC (permalink / raw
To: gentoo-commits
commit: 81ee735cf004e6d4ed9a975d0a4ff54ed31c324f
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 3 11:18:27 2022 +0000
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sun Jul 3 11:18:27 2022 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=81ee735c
Skip stage2 everywhere in x86
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
releases/specs/x86/hardened/stage2-openrc.spec | 10 ----------
releases/specs/x86/hardened/stage3-openrc.spec | 2 +-
releases/specs/x86/i486/stage2-openrc.spec | 10 ----------
releases/specs/x86/i486/stage3-openrc.spec | 2 +-
releases/specs/x86/i686/stage2-openrc.spec | 10 ----------
releases/specs/x86/i686/stage2-systemd.spec | 10 ----------
releases/specs/x86/i686/stage3-openrc.spec | 2 +-
releases/specs/x86/i686/stage3-systemd.spec | 2 +-
releases/specs/x86/musl/stage2.spec | 11 -----------
releases/specs/x86/musl/stage3.spec | 2 +-
tools/catalyst-auto-x86.conf | 10 +++++-----
11 files changed, 10 insertions(+), 61 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
diff --git a/tools/catalyst-auto-x86.conf b/tools/catalyst-auto-x86.conf
index 0149eab5..ced79e5d 100644
--- a/tools/catalyst-auto-x86.conf
+++ b/tools/catalyst-auto-x86.conf
@@ -17,16 +17,16 @@ SETS="
musl
"
-SET_i486_openrc_SPECS="i486/stage1-openrc.spec i486/stage2-openrc.spec i486/stage3-openrc.spec"
+SET_i486_openrc_SPECS="i486/stage1-openrc.spec i486/stage3-openrc.spec"
SET_i486_openrc_OPTIONAL_SPECS="i486/installcd-stage1-openrc.spec i486/installcd-stage2-minimal-openrc.spec"
-SET_i686_openrc_SPECS="i686/stage1-openrc.spec i686/stage2-openrc.spec i686/stage3-openrc.spec"
-SET_i686_systemd_SPECS="i686/stage1-systemd.spec i686/stage2-systemd.spec i686/stage3-systemd.spec"
+SET_i686_openrc_SPECS="i686/stage1-openrc.spec i686/stage3-openrc.spec"
+SET_i686_systemd_SPECS="i686/stage1-systemd.spec i686/stage3-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-openrc.spec hardened/admincd-stage2-openrc.spec"
-SET_musl_SPECS="musl/stage1.spec musl/stage2.spec musl/stage3.spec"
+SET_musl_SPECS="musl/stage1.spec musl/stage3.spec"
KCONFIG_DIR=${REPO_DIR}/releases/kconfig/x86
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2022-07-03 11:18 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-07-03 11:18 [gentoo-commits] proj/releng:master commit in: releases/specs/x86/i686/, releases/specs/x86/hardened/, tools/, Andreas K. Hüttel
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox