From 24e4e8950f936ec891a5c53340b1ac59a8476d92 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20K=2E=20H=C3=BCttel?= Date: Sun, 23 Jan 2022 19:37:53 +0100 Subject: [PATCH] arm64: Unify stage and spec naming MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Andreas K. Hüttel --- releases/specs/arm64/installcd-stage1.spec | 2 +- .../specs/arm64/{stage1.spec => stage1-openrc.spec} | 4 ++-- .../arm64/{systemd-stage1.spec => stage1-systemd.spec} | 0 releases/specs/arm64/stage2.spec | 10 ---------- .../specs/arm64/{stage3.spec => stage3-openrc.spec} | 4 ++-- .../arm64/{systemd-stage3.spec => stage3-systemd.spec} | 0 releases/specs/arm64/systemd-stage2.spec | 10 ---------- tools/catalyst-auto-arm64.conf | 8 ++++---- 8 files changed, 9 insertions(+), 29 deletions(-) rename releases/specs/arm64/{stage1.spec => stage1-openrc.spec} (77%) rename releases/specs/arm64/{systemd-stage1.spec => stage1-systemd.spec} (100%) delete mode 100644 releases/specs/arm64/stage2.spec rename releases/specs/arm64/{stage3.spec => stage3-openrc.spec} (69%) rename releases/specs/arm64/{systemd-stage3.spec => stage3-systemd.spec} (100%) delete mode 100644 releases/specs/arm64/systemd-stage2.spec diff --git a/releases/specs/arm64/installcd-stage1.spec b/releases/specs/arm64/installcd-stage1.spec index 81133fd3..ac149e64 100644 --- a/releases/specs/arm64/installcd-stage1.spec +++ b/releases/specs/arm64/installcd-stage1.spec @@ -4,7 +4,7 @@ version_stamp: @TIMESTAMP@ rel_type: default profile: default/linux/arm64/17.0 snapshot: @TIMESTAMP@ -source_subpath: default/stage3-arm64-@TIMESTAMP@ +source_subpath: default/stage3-arm64-openrc-@TIMESTAMP@ compression_mode: pixz portage_confdir: @REPO_DIR@/releases/portage/isos diff --git a/releases/specs/arm64/stage1.spec b/releases/specs/arm64/stage1-openrc.spec similarity index 77% rename from releases/specs/arm64/stage1.spec rename to releases/specs/arm64/stage1-openrc.spec index a0f8a64c..75032fda 100644 --- a/releases/specs/arm64/stage1.spec +++ b/releases/specs/arm64/stage1-openrc.spec @@ -1,10 +1,10 @@ subarch: arm64 target: stage1 -version_stamp: @TIMESTAMP@ +version_stamp: openrc-@TIMESTAMP@ rel_type: default profile: default/linux/arm64/17.0 snapshot: @TIMESTAMP@ -source_subpath: default/stage3-arm64-latest +source_subpath: default/stage3-arm64-openrc-latest compression_mode: pixz update_seed: yes update_seed_command: --update --deep --jobs=5 --newuse --complete-graph @world diff --git a/releases/specs/arm64/systemd-stage1.spec b/releases/specs/arm64/stage1-systemd.spec similarity index 100% rename from releases/specs/arm64/systemd-stage1.spec rename to releases/specs/arm64/stage1-systemd.spec diff --git a/releases/specs/arm64/stage2.spec b/releases/specs/arm64/stage2.spec deleted file mode 100644 index daef1ea0..00000000 --- a/releases/specs/arm64/stage2.spec +++ /dev/null @@ -1,10 +0,0 @@ -subarch: arm64 -target: stage2 -version_stamp: @TIMESTAMP@ -rel_type: default -profile: default/linux/arm64/17.0 -snapshot: @TIMESTAMP@ -source_subpath: default/stage1-arm64-@TIMESTAMP@ -compression_mode: pixz -portage_confdir: @REPO_DIR@/releases/portage/stages -portage_prefix: releng diff --git a/releases/specs/arm64/stage3.spec b/releases/specs/arm64/stage3-openrc.spec similarity index 69% rename from releases/specs/arm64/stage3.spec rename to releases/specs/arm64/stage3-openrc.spec index d2253fda..8b22b222 100644 --- a/releases/specs/arm64/stage3.spec +++ b/releases/specs/arm64/stage3-openrc.spec @@ -1,10 +1,10 @@ subarch: arm64 target: stage3 -version_stamp: @TIMESTAMP@ +version_stamp: openrc-@TIMESTAMP@ rel_type: default profile: default/linux/arm64/17.0 snapshot: @TIMESTAMP@ -source_subpath: default/stage1-arm64-@TIMESTAMP@ +source_subpath: default/stage1-arm64-openrc-@TIMESTAMP@ compression_mode: pixz portage_confdir: @REPO_DIR@/releases/portage/stages portage_prefix: releng diff --git a/releases/specs/arm64/systemd-stage3.spec b/releases/specs/arm64/stage3-systemd.spec similarity index 100% rename from releases/specs/arm64/systemd-stage3.spec rename to releases/specs/arm64/stage3-systemd.spec diff --git a/releases/specs/arm64/systemd-stage2.spec b/releases/specs/arm64/systemd-stage2.spec deleted file mode 100644 index 756e0bba..00000000 --- a/releases/specs/arm64/systemd-stage2.spec +++ /dev/null @@ -1,10 +0,0 @@ -subarch: arm64 -target: stage2 -version_stamp: systemd-@TIMESTAMP@ -rel_type: default -profile: default/linux/arm64/17.0/systemd -snapshot: @TIMESTAMP@ -source_subpath: default/stage1-arm64-systemd-@TIMESTAMP@ -compression_mode: pixz -portage_confdir: @REPO_DIR@/releases/portage/stages -portage_prefix: releng diff --git a/tools/catalyst-auto-arm64.conf b/tools/catalyst-auto-arm64.conf index 3d57dc12..0e32bc43 100644 --- a/tools/catalyst-auto-arm64.conf +++ b/tools/catalyst-auto-arm64.conf @@ -8,7 +8,7 @@ SUBARCH=`grep subarch $SPECS_DIR/stage1.spec | awk '{print $2}'` SETS="musl muslhardened default" -SET_default_SPECS="stage1.spec stage3.spec systemd-stage1.spec systemd-stage3.spec" +SET_default_SPECS="stage1-openrc.spec stage3-openrc.spec stage1-systemd.spec stage3-systemd.spec" SET_default_OPTIONAL_SPECS="installcd-stage1.spec installcd-stage2-minimal.spec" SET_musl_SPECS="musl/stage1.spec musl/stage3.spec" @@ -40,10 +40,10 @@ post_build() { installcd-stage2-minimal.spec) upload install-arm64-*${TIMESTAMP}*.iso* ;; - stage3.spec) - upload stage3-${SUBARCH}-*${TIMESTAMP}*.tar.xz* + stage3-openrc.spec) + upload stage3-${SUBARCH}-openrc-${TIMESTAMP}*.xz* ;; - systemd-stage3.spec) + stage3-systemd.spec) upload stage3-${SUBARCH}-systemd-${TIMESTAMP}*.xz* ;; *)