From 3714fd918b3876f6c389e6f64029656c62e63185 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20K=2E=20H=C3=BCttel?= Date: Mon, 14 Mar 2022 16:12:03 +0100 Subject: [PATCH] Skip some amd64 stage2 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Andreas K. Hüttel --- releases/specs/amd64/stage2-openrc.spec | 10 ---------- releases/specs/amd64/stage2-systemd.spec | 10 ---------- releases/specs/amd64/stage3-openrc.spec | 2 +- releases/specs/amd64/stage3-systemd.spec | 2 +- releases/specs/amd64/stage3d-openrc.spec | 2 +- releases/specs/amd64/stage3d-systemd.spec | 2 +- tools/catalyst-auto-amd64.conf | 4 ++-- 7 files changed, 6 insertions(+), 26 deletions(-) delete mode 100644 releases/specs/amd64/stage2-openrc.spec delete mode 100644 releases/specs/amd64/stage2-systemd.spec diff --git a/releases/specs/amd64/stage2-openrc.spec b/releases/specs/amd64/stage2-openrc.spec deleted file mode 100644 index aaa6893d..00000000 --- a/releases/specs/amd64/stage2-openrc.spec +++ /dev/null @@ -1,10 +0,0 @@ -subarch: amd64 -target: stage2 -version_stamp: openrc-@TIMESTAMP@ -rel_type: default -profile: default/linux/amd64/17.1 -snapshot: @TIMESTAMP@ -source_subpath: default/stage1-amd64-openrc-@TIMESTAMP@ -compression_mode: pixz -portage_confdir: @REPO_DIR@/releases/portage/stages -portage_prefix: releng diff --git a/releases/specs/amd64/stage2-systemd.spec b/releases/specs/amd64/stage2-systemd.spec deleted file mode 100644 index 58a1391a..00000000 --- a/releases/specs/amd64/stage2-systemd.spec +++ /dev/null @@ -1,10 +0,0 @@ -subarch: amd64 -target: stage2 -version_stamp: systemd-@TIMESTAMP@ -rel_type: default -profile: default/linux/amd64/17.1/systemd -snapshot: @TIMESTAMP@ -source_subpath: default/stage1-amd64-systemd-@TIMESTAMP@ -compression_mode: pixz -portage_confdir: @REPO_DIR@/releases/portage/stages -portage_prefix: releng diff --git a/releases/specs/amd64/stage3-openrc.spec b/releases/specs/amd64/stage3-openrc.spec index 79ad0d70..ae91bc50 100644 --- a/releases/specs/amd64/stage3-openrc.spec +++ b/releases/specs/amd64/stage3-openrc.spec @@ -4,7 +4,7 @@ version_stamp: openrc-@TIMESTAMP@ rel_type: default profile: default/linux/amd64/17.1 snapshot: @TIMESTAMP@ -source_subpath: default/stage2-amd64-openrc-@TIMESTAMP@ +source_subpath: default/stage1-amd64-openrc-@TIMESTAMP@ compression_mode: pixz portage_confdir: @REPO_DIR@/releases/portage/stages portage_prefix: releng diff --git a/releases/specs/amd64/stage3-systemd.spec b/releases/specs/amd64/stage3-systemd.spec index c81d78d8..cb188ed7 100644 --- a/releases/specs/amd64/stage3-systemd.spec +++ b/releases/specs/amd64/stage3-systemd.spec @@ -4,7 +4,7 @@ version_stamp: systemd-@TIMESTAMP@ rel_type: default profile: default/linux/amd64/17.1/systemd snapshot: @TIMESTAMP@ -source_subpath: default/stage2-amd64-systemd-@TIMESTAMP@ +source_subpath: default/stage1-amd64-systemd-@TIMESTAMP@ compression_mode: pixz portage_confdir: @REPO_DIR@/releases/portage/stages portage_prefix: releng diff --git a/releases/specs/amd64/stage3d-openrc.spec b/releases/specs/amd64/stage3d-openrc.spec index 1f39cb01..667d3b6d 100644 --- a/releases/specs/amd64/stage3d-openrc.spec +++ b/releases/specs/amd64/stage3d-openrc.spec @@ -4,7 +4,7 @@ version_stamp: desktop-openrc-@TIMESTAMP@ rel_type: default profile: default/linux/amd64/17.1/desktop snapshot: @TIMESTAMP@ -source_subpath: default/stage2-amd64-openrc-@TIMESTAMP@ +source_subpath: default/stage1-amd64-openrc-@TIMESTAMP@ compression_mode: pixz portage_confdir: @REPO_DIR@/releases/portage/stages portage_prefix: releng diff --git a/releases/specs/amd64/stage3d-systemd.spec b/releases/specs/amd64/stage3d-systemd.spec index 6160e2df..ae1a4233 100644 --- a/releases/specs/amd64/stage3d-systemd.spec +++ b/releases/specs/amd64/stage3d-systemd.spec @@ -4,7 +4,7 @@ version_stamp: desktop-systemd-@TIMESTAMP@ rel_type: default profile: default/linux/amd64/17.1/desktop/systemd snapshot: @TIMESTAMP@ -source_subpath: default/stage2-amd64-systemd-@TIMESTAMP@ +source_subpath: default/stage1-amd64-systemd-@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 9d6bf815..e4882343 100644 --- a/tools/catalyst-auto-amd64.conf +++ b/tools/catalyst-auto-amd64.conf @@ -24,12 +24,12 @@ SETS=" x32_openrc " -SET_openrc_SPECS="stage1-openrc.spec stage2-openrc.spec stage3-openrc.spec" +SET_openrc_SPECS="stage1-openrc.spec stage3-openrc.spec" SET_openrc_OPTIONAL_SPECS="stage3d-openrc.spec installcd-stage1.spec installcd-stage2-minimal.spec" SET_livegui_OPTIONAL_SPECS="livegui/livegui-stage1.spec livegui/livegui-stage2.spec" -SET_systemd_SPECS="stage1-systemd.spec stage2-systemd.spec stage3-systemd.spec" +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"