commit: 30f989d595284610d26cc690b04698073aab9aa2
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 22 15:07:38 2022 +0000
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sat Jan 22 15:07:38 2022 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=30f989d5
ia64: add openrc suffix to specs and stage names
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
releases/specs/ia64/installcd-stage1.spec | 2 +-
releases/specs/ia64/{stage1.spec => stage1-openrc.spec} | 4 ++--
releases/specs/ia64/stage2.spec | 10 ----------
releases/specs/ia64/{stage3.spec => stage3-openrc.spec} | 4 ++--
tools/catalyst-auto-ia64.conf | 10 +++-------
5 files changed, 8 insertions(+), 22 deletions(-)
diff --git a/releases/specs/ia64/installcd-stage1.spec
b/releases/specs/ia64/installcd-stage1.spec
index b9f08f7a..b9be8043 100644
--- a/releases/specs/ia64/installcd-stage1.spec
+++ b/releases/specs/ia64/installcd-stage1.spec
@@ -4,7 +4,7 @@ target: livecd-stage1
rel_type: default
profile: default/linux/ia64/17.0
snapshot: @TIMESTAMP@
-source_subpath: default/stage3-ia64-@TIMESTAMP@
+source_subpath: default/stage3-ia64-openrc-@TIMESTAMP@
compression_mode: pixz
portage_confdir: @REPO_DIR@/releases/portage/isos
diff --git a/releases/specs/ia64/stage1.spec
b/releases/specs/ia64/stage1-openrc.spec
similarity index 76%
rename from releases/specs/ia64/stage1.spec
rename to releases/specs/ia64/stage1-openrc.spec
index 47ce50b0..4de2bf68 100644
--- a/releases/specs/ia64/stage1.spec
+++ b/releases/specs/ia64/stage1-openrc.spec
@@ -1,10 +1,10 @@
subarch: ia64
-version_stamp: @TIMESTAMP@
+version_stamp: openrc-@TIMESTAMP@
target: stage1
rel_type: default
profile: default/linux/ia64/17.0
snapshot: @TIMESTAMP@
-source_subpath: default/stage3-ia64-latest
+source_subpath: default/stage3-ia64-openrc-latest
compression_mode: pixz
update_seed: yes
update_seed_command: --update --deep --newuse @world
diff --git a/releases/specs/ia64/stage2.spec b/releases/specs/ia64/stage2.spec
deleted file mode 100644
index db5c91d7..00000000
--- a/releases/specs/ia64/stage2.spec
+++ /dev/null
@@ -1,10 +0,0 @@
-subarch: ia64
-version_stamp: @TIMESTAMP@
-target: stage2
-rel_type: default
-profile: default/linux/ia64/17.0
-snapshot: @TIMESTAMP@
-source_subpath: default/stage1-ia64-@TIMESTAMP@
-compression_mode: pixz
-portage_confdir: @REPO_DIR@/releases/portage/stages
-portage_prefix: releng
diff --git a/releases/specs/ia64/stage3.spec
b/releases/specs/ia64/stage3-openrc.spec
similarity index 69%
rename from releases/specs/ia64/stage3.spec
rename to releases/specs/ia64/stage3-openrc.spec
index 416fc84b..dcb28457 100644
--- a/releases/specs/ia64/stage3.spec
+++ b/releases/specs/ia64/stage3-openrc.spec
@@ -1,10 +1,10 @@
subarch: ia64
-version_stamp: @TIMESTAMP@
+version_stamp: openrc-@TIMESTAMP@
target: stage3
rel_type: default
profile: default/linux/ia64/17.0
snapshot: @TIMESTAMP@
-source_subpath: default/stage1-ia64-@TIMESTAMP@
+source_subpath: default/stage1-ia64-openrc-@TIMESTAMP@
compression_mode: pixz
portage_confdir: @REPO_DIR@/releases/portage/stages
portage_prefix: releng
diff --git a/tools/catalyst-auto-ia64.conf b/tools/catalyst-auto-ia64.conf
index 054f28db..f6907a63 100644
--- a/tools/catalyst-auto-ia64.conf
+++ b/tools/catalyst-auto-ia64.conf
@@ -5,11 +5,7 @@ UPLOAD_USER=ia64
UPLOAD_KEY=/root/.ssh/id_rsa
SPECS_DIR=${REPO_DIR}/releases/specs/ia64
-SPECS="stage1.spec stage3.spec"
-#SPECS="${SPECS} installcd-stage1.spec installcd-stage2-minimal.spec"
-#SPECS="${SPECS} stage2-desktop.spec stage3-desktop.spec"
-#SPECS="${SPECS} livecd-stage1.spec livecd-stage2.spec"
-
+SPECS="stage1-openrc.spec stage3-openrc.spec"
OPTIONAL_SPECS="installcd-stage1.spec installcd-stage2-minimal.spec"
KCONFIG_DIR=${REPO_DIR}/releases/kconfig/ia64
@@ -36,8 +32,8 @@ post_build() {
installcd-stage2*)
upload *${TIMESTAMP}*.iso*
;;
- stage3.spec)
- upload stage3-*${TIMESTAMP}*.xz*
+ stage3-openrc.spec)
+ upload stage3-*openrc-${TIMESTAMP}*.xz*
;;
*)
echo "Finished ${spec}"
