From 3e184dc0f7d813b182992267713e9521dcd564c7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20K=2E=20H=C3=BCttel?= <dilfridge@gentoo.org>
Date: Sun, 22 May 2022 23:39:10 +0200
Subject: [PATCH] s390: update stage file and spec file names (openrc)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Andreas K. Hüttel <dilfridge@gentoo.org>
---
 releases/specs/s390/s390/netboot/netboot.spec         |  2 +-
 .../s390/s390/{stage1.spec => stage1-openrc.spec}     |  4 ++--
 .../s390/s390/{stage3.spec => stage3-openrc.spec}     |  4 ++--
 tools/catalyst-auto-s390.conf                         | 11 +++++------
 4 files changed, 10 insertions(+), 11 deletions(-)
 rename releases/specs/s390/s390/{stage1.spec => stage1-openrc.spec} (78%)
 rename releases/specs/s390/s390/{stage3.spec => stage3-openrc.spec} (72%)

diff --git a/releases/specs/s390/s390/netboot/netboot.spec b/releases/specs/s390/s390/netboot/netboot.spec
index 7c812446..8781426b 100644
--- a/releases/specs/s390/s390/netboot/netboot.spec
+++ b/releases/specs/s390/s390/netboot/netboot.spec
@@ -1,7 +1,7 @@
 # S390 Netboot spec file, based in HPPA Netboot spec file by Guy Martin
 version_stamp: @TIMESTAMP@
 snapshot: @TIMESTAMP@
-source_subpath: default/stage3-s390-@TIMESTAMP@
+source_subpath: default/stage3-s390-openrc-@TIMESTAMP@
 pkgcache_path: /var/tmp/catalyst/packages/default/netboot2-s390
 
 # these shouldn't change
diff --git a/releases/specs/s390/s390/stage1.spec b/releases/specs/s390/s390/stage1-openrc.spec
similarity index 78%
rename from releases/specs/s390/s390/stage1.spec
rename to releases/specs/s390/s390/stage1-openrc.spec
index 79544acb..4889d88c 100644
--- a/releases/specs/s390/s390/stage1.spec
+++ b/releases/specs/s390/s390/stage1-openrc.spec
@@ -1,10 +1,10 @@
 subarch: s390
-version_stamp: @TIMESTAMP@
+version_stamp: openrc-@TIMESTAMP@
 target: stage1
 rel_type: default
 profile: default/linux/s390/17.0
 snapshot: @TIMESTAMP@
-source_subpath: default/stage3-s390-latest
+source_subpath: default/stage3-s390-openrc-latest
 update_seed: yes
 update_seed_command: --update --deep --newuse @world
 compression_mode: pixz
diff --git a/releases/specs/s390/s390/stage3.spec b/releases/specs/s390/s390/stage3-openrc.spec
similarity index 72%
rename from releases/specs/s390/s390/stage3.spec
rename to releases/specs/s390/s390/stage3-openrc.spec
index f615e864..91a8cb32 100644
--- a/releases/specs/s390/s390/stage3.spec
+++ b/releases/specs/s390/s390/stage3-openrc.spec
@@ -1,10 +1,10 @@
 subarch: s390
-version_stamp: @TIMESTAMP@
+version_stamp: openrc-@TIMESTAMP@
 target: stage3
 rel_type: default
 profile: default/linux/s390/17.0
 snapshot: @TIMESTAMP@
-source_subpath: default/stage1-s390-@TIMESTAMP@
+source_subpath: default/stage1-s390-openrc-@TIMESTAMP@
 compression_mode: pixz
 portage_confdir: @REPO_DIR@/releases/portage/stages
 pkgcache_path: /var/tmp/catalyst/packages/default/stage3-s390
diff --git a/tools/catalyst-auto-s390.conf b/tools/catalyst-auto-s390.conf
index 3b8475ba..8722de98 100644
--- a/tools/catalyst-auto-s390.conf
+++ b/tools/catalyst-auto-s390.conf
@@ -6,11 +6,10 @@ UPLOAD_KEY=/root/.ssh/id_rsa
 SPECS_DIR=${REPO_DIR}/releases/specs/s390/s390
 SUBARCH=`grep subarch $SPECS_DIR/stage1.spec | awk '{print $2}'`
 
-SETS="default netboot"
+SETS="openrc"
 
-SET_default_SPECS="stage1.spec stage3.spec"
-
-SET_netboot_SPECS="netboot/netboot.spec"
+SET_openrc_SPECS="stage1-openrc.spec stage3-openrc.spec"
+SET_openrc_OPTIONAL_SPECS="netboot/netboot.spec"
 
 KCONFIG_DIR=${REPO_DIR}/releases/kconfig/s390
 
@@ -38,8 +37,8 @@ post_build() {
 		mv netboot2-s390-${TIMESTAMP}/kernels/misc/netboot.igz netboot2-s390-${TIMESTAMP}/netboot-s390-initramfs-${TIMESTAMP}
 		upload netboot2-s390-${TIMESTAMP}/netboot*
 		;;
-	stage3.spec)
-		upload stage3-${SUBARCH}-*${TIMESTAMP}*.tar.xz*
+	stage3-openrc.spec)
+		upload stage3-${SUBARCH}-openrc-${TIMESTAMP}.tar.xz*
 		;;
 	*)
 		echo "Finished ${spec}"