[gentoo-commits] proj/releng:master commit in: tools/, releases/specs/ppc/ppc64le/

[Georgy Yakovlev]

commit:     4ee10bfab3945e1614a0fa2b0d8aedecd03ae496
Author:     Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
AuthorDate: Wed Jul 14 10:29:35 2021 +0000
Commit:     Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
CommitDate: Wed Jul 14 10:29:35 2021 +0000
URL:        https://gitweb.gentoo.org/proj/releng.git/commit/?id=4ee10bfa

releases/specs/ppc/ppc64le: new spec naming scheme

introduce explicit openrc in spec/tarball name.
change power9 specs to proper catalyst subarch: power9le

Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org>

 ...tage1.spec => stage1-musl-hardened-openrc.spec} |  4 ++--
 ...ge1-power9.spec => stage1-openrc-power9le.spec} |  8 +++----
 .../ppc64le/{stage1.spec => stage1-openrc.spec}    |  4 ++--
 .../{systemd-stage1.spec => stage1-systemd.spec}   |  0
 ...tage3.spec => stage3-musl-hardened-openrc.spec} |  4 ++--
 ...ge3-power9.spec => stage3-openrc-power9le.spec} |  6 ++---
 .../ppc64le/{stage3.spec => stage3-openrc.spec}    |  4 ++--
 .../{systemd-stage3.spec => stage3-systemd.spec}   |  0
 tools/catalyst-auto-ppc64le.conf                   | 27 ++++++++++++++--------
 9 files changed, 32 insertions(+), 25 deletions(-)

diff --git a/releases/specs/ppc/ppc64le/musl-hardened-stage1.spec b/releases/specs/ppc/ppc64le/stage1-musl-hardened-openrc.spec
similarity index 76%
rename from releases/specs/ppc/ppc64le/musl-hardened-stage1.spec
rename to releases/specs/ppc/ppc64le/stage1-musl-hardened-openrc.spec
index 9d65a83c..d1a74651 100644
--- a/releases/specs/ppc/ppc64le/musl-hardened-stage1.spec
+++ b/releases/specs/ppc/ppc64le/stage1-musl-hardened-openrc.spec
@@ -1,10 +1,10 @@
 subarch: ppc64le
 target: stage1
-version_stamp: musl-hardened-@TIMESTAMP@
+version_stamp: musl-hardened-openrc-@TIMESTAMP@
 rel_type: musl-hardened
 profile: default/linux/ppc64le/17.0/musl/hardened
 snapshot: @TIMESTAMP@
-source_subpath: musl-hardened/stage3-ppc64le-musl-hardened-latest
+source_subpath: musl-hardened/stage3-ppc64le-musl-hardened-openrc-latest
 chost: powerpc64le-gentoo-linux-musl
 compression_mode: pixz_x
 update_seed: yes

diff --git a/releases/specs/ppc/ppc64le/stage1-power9.spec b/releases/specs/ppc/ppc64le/stage1-openrc-power9le.spec
similarity index 63%
rename from releases/specs/ppc/ppc64le/stage1-power9.spec
rename to releases/specs/ppc/ppc64le/stage1-openrc-power9le.spec
index d09343e8..caf9c04d 100644
--- a/releases/specs/ppc/ppc64le/stage1-power9.spec
+++ b/releases/specs/ppc/ppc64le/stage1-openrc-power9le.spec
@@ -1,10 +1,10 @@
 subarch: power9le
 target: stage1
-version_stamp: power9-@TIMESTAMP@
-rel_type: power9
-profile: default/linux/ppc64le/17.0
+version_stamp: openrc-@TIMESTAMP@
+rel_type: power9le
+profile: power9le/linux/ppc64le/17.0
 snapshot: @TIMESTAMP@
-source_subpath: power9/stage3-ppc64le-power9-latest
+source_subpath: power9le/stage3-power9le-openrc-latest
 compression_mode: pixz_x
 update_seed: yes
 update_seed_command: --update --deep --newuse @world --jobs 64 --load-average 128

diff --git a/releases/specs/ppc/ppc64le/stage1.spec b/releases/specs/ppc/ppc64le/stage1-openrc.spec
similarity index 77%
rename from releases/specs/ppc/ppc64le/stage1.spec
rename to releases/specs/ppc/ppc64le/stage1-openrc.spec
index 6c04bf37..2ac862ca 100644
--- a/releases/specs/ppc/ppc64le/stage1.spec
+++ b/releases/specs/ppc/ppc64le/stage1-openrc.spec
@@ -1,10 +1,10 @@
 subarch: ppc64le
 target: stage1
-version_stamp: @TIMESTAMP@
+version_stamp: openrc-@TIMESTAMP@
 rel_type: default
 profile: default/linux/ppc64le/17.0
 snapshot: @TIMESTAMP@
-source_subpath: default/stage3-ppc64le-latest
+source_subpath: default/stage3-ppc64le-openrc-latest
 compression_mode: pixz_x
 update_seed: yes
 update_seed_command: --update --deep --newuse @world --jobs 5 --load-average 5

diff --git a/releases/specs/ppc/ppc64le/systemd-stage1.spec b/releases/specs/ppc/ppc64le/stage1-systemd.spec
similarity index 100%
rename from releases/specs/ppc/ppc64le/systemd-stage1.spec
rename to releases/specs/ppc/ppc64le/stage1-systemd.spec

diff --git a/releases/specs/ppc/ppc64le/musl-hardened-stage3.spec b/releases/specs/ppc/ppc64le/stage3-musl-hardened-openrc.spec
similarity index 67%
rename from releases/specs/ppc/ppc64le/musl-hardened-stage3.spec
rename to releases/specs/ppc/ppc64le/stage3-musl-hardened-openrc.spec
index 588fe8c3..83cb21ca 100644
--- a/releases/specs/ppc/ppc64le/musl-hardened-stage3.spec
+++ b/releases/specs/ppc/ppc64le/stage3-musl-hardened-openrc.spec
@@ -1,10 +1,10 @@
 subarch: ppc64le
 target: stage3
-version_stamp: musl-hardened-@TIMESTAMP@
+version_stamp: musl-hardened-openrc-@TIMESTAMP@
 rel_type: musl-hardened
 profile: default/linux/ppc64le/17.0/musl/hardened
 snapshot: @TIMESTAMP@
-source_subpath: musl-hardened/stage1-ppc64le-musl-hardened-@TIMESTAMP@
+source_subpath: musl-hardened/stage1-ppc64le-musl-hardened-openrc-@TIMESTAMP@
 compression_mode: pixz_x
 portage_confdir: @REPO_DIR@/releases/portage/stages-musl
 portage_prefix: releng

diff --git a/releases/specs/ppc/ppc64le/stage3-power9.spec b/releases/specs/ppc/ppc64le/stage3-openrc-power9le.spec
similarity index 63%
rename from releases/specs/ppc/ppc64le/stage3-power9.spec
rename to releases/specs/ppc/ppc64le/stage3-openrc-power9le.spec
index ab5a27c8..37e50ddd 100644
--- a/releases/specs/ppc/ppc64le/stage3-power9.spec
+++ b/releases/specs/ppc/ppc64le/stage3-openrc-power9le.spec
@@ -1,10 +1,10 @@
 subarch: power9le
 target: stage3
-version_stamp: power9-@TIMESTAMP@
-rel_type: power9
+version_stamp: openrc-@TIMESTAMP@
+rel_type: power9le
 profile: default/linux/ppc64le/17.0
 snapshot: @TIMESTAMP@
-source_subpath: default/stage1-ppc64le-@TIMESTAMP@
+source_subpath: default/stage1-power9le-openrc-@TIMESTAMP@
 compression_mode: pixz_x
 portage_confdir: @REPO_DIR@/releases/portage/stages
 portage_prefix: releng

diff --git a/releases/specs/ppc/ppc64le/stage3.spec b/releases/specs/ppc/ppc64le/stage3-openrc.spec
similarity index 69%
rename from releases/specs/ppc/ppc64le/stage3.spec
rename to releases/specs/ppc/ppc64le/stage3-openrc.spec
index 33beba6f..620b5fad 100644
--- a/releases/specs/ppc/ppc64le/stage3.spec
+++ b/releases/specs/ppc/ppc64le/stage3-openrc.spec
@@ -1,10 +1,10 @@
 subarch: ppc64le
 target: stage3
-version_stamp: @TIMESTAMP@
+version_stamp: openrc-@TIMESTAMP@
 rel_type: default
 profile: default/linux/ppc64le/17.0
 snapshot: @TIMESTAMP@
-source_subpath: default/stage1-ppc64le-@TIMESTAMP@
+source_subpath: default/stage1-ppc64le-openrc-@TIMESTAMP@
 compression_mode: pixz_x
 portage_confdir: @REPO_DIR@/releases/portage/stages
 portage_prefix: releng

diff --git a/releases/specs/ppc/ppc64le/systemd-stage3.spec b/releases/specs/ppc/ppc64le/stage3-systemd.spec
similarity index 100%
rename from releases/specs/ppc/ppc64le/systemd-stage3.spec
rename to releases/specs/ppc/ppc64le/stage3-systemd.spec

diff --git a/tools/catalyst-auto-ppc64le.conf b/tools/catalyst-auto-ppc64le.conf
index 6fbd174b..f5486765 100644
--- a/tools/catalyst-auto-ppc64le.conf
+++ b/tools/catalyst-auto-ppc64le.conf
@@ -5,10 +5,11 @@ UPLOAD_USER=ppc
 UPLOAD_KEY=/root/.ssh/id_rsa
 SPECS_DIR=${REPO_DIR}/releases/specs/ppc/ppc64le
 
-SPECS="stage1.spec stage3.spec"
-OPTIONAL_SPECS="systemd-stage1.spec systemd-stage3.spec"
-OPTIONAL_SPECS="${OPTIONAL_SPECS} musl-hardened-stage1.spec musl-hardened-stage3.spec"
-OPTIONAL_SPECS="${OPTIONAL_SPECS} installcd-stage1.spec installcd-stage2-minimal.spec"
+SPECS="stage1-openrc.spec stage3-openrc.spec"
+SPECS+=" installcd-stage1.spec installcd-stage2-minimal.spec"
+OPTIONAL_SPECS="stage1-systemd.spec stage3-systemd.spec"
+OPTIONAL_SPECS+=" stage1-openrc-power9le.spec stage3-openrc-power9le.spec"
+OPTIONAL_SPECS+=" musl-hardened-stage1.spec musl-hardened-stage3.spec"
 
 #SPECS="${SPECS} stage2-desktop.spec stage3-desktop.spec"
 #SPECS="${SPECS} livecd-stage1.spec livecd-stage2.spec"
@@ -20,7 +21,7 @@ EMAIL_SUBJECT_PREPEND="[ppc64le-auto]"
 update_symlinks() {
 	# Symlink the latest stages3 to build from
 	local d f t
-	for d in "${BUILD_SRCDIR_BASE}/builds/default" "${BUILD_SRCDIR_BASE}/builds/musl-hardened"; do
+	for d in "${BUILD_SRCDIR_BASE}"/builds/{default,power9le,musl-hardened} ; do
 		pushd "${d}" >/dev/null
 		for t in ppc64le; do
 			for f in $(ls stage3-${t}-*xz | grep -v latest | give_latest_from_dates) ; do
@@ -41,14 +42,20 @@ post_build() {
 	installcd-stage2-minimal.spec)
 		upload default/*${TIMESTAMP}*.iso*
 		;;
-	stage3*.spec)
-		upload default/stage3-ppc64le-${TIMESTAMP}*.xz*
+	stage3-openrc.spec)
+		upload default/stage3-ppc64le-openrc-${TIMESTAMP}*.xz*
 		;;
-	systemd-stage3*.spec)
+	stage3-systemd.spec)
 		upload default/stage3-ppc64le-systemd-${TIMESTAMP}*.xz*
 		;;
-	musl-hardened-stage3*.spec)
-		upload musl-hardened/stage3-ppc64le-musl-hardened-${TIMESTAMP}*.xz*
+	stage3-openrc-power9le.spec)
+		upload power9le/stage3-power9le-openrc-${TIMESTAMP}*.xz*
+		;;
+	stage3-systemd-power9le.spec)
+		upload power9le/stage3-power9le-systemd-${TIMESTAMP}*.xz*
+		;;
+	stage3-musl-hardened-openrc.spec)
+		upload musl-hardened/stage3-ppc64le-musl-hardened-openrc-${TIMESTAMP}*.xz*
 		;;
 	*)
 		echo "Finished ${spec}"