s390x: enable systemd stages

Signed-off-by: Andreas K. Hüttel <dilfridge@gentoo.org>

6 files changed, 37 insertions, 11 deletions

diff --git a/releases/specs/s390/s390x/netboot/netboot.spec b/releases/specs/s390/s390x/netboot/netboot.spec
index 45d26157..e3914b9d 100644
--- a/releases/specs/s390/s390x/netboot/netboot.spec
+++ b/releases/specs/s390/s390x/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-s390x-@TIMESTAMP@
+source_subpath: default/stage3-s390x-openrc-@TIMESTAMP@
 pkgcache_path: /var/tmp/catalyst/packages/default/netboot2-s390x
 
 # these shouldn't change
diff --git a/releases/specs/s390/s390x/stage1.spec b/releases/specs/s390/s390x/stage1-openrc.spec
index c2410423..ffe05e35 100644
--- a/releases/specs/s390/s390x/stage1.spec
+++ b/releases/specs/s390/s390x/stage1-openrc.spec
@@ -1,10 +1,10 @@
 subarch: s390x
-version_stamp: @TIMESTAMP@
+version_stamp: @TIMESTAMP@-openrc
 target: stage1
 rel_type: default
 profile: default/linux/s390/17.0/s390x
 snapshot: @TIMESTAMP@
-source_subpath: default/stage3-s390x-latest
+source_subpath: default/stage3-s390x-openrc-latest
 update_seed: yes
 update_seed_command: --update --deep --newuse @world
 compression_mode: pixz
diff --git a/releases/specs/s390/s390x/stage1-systemd.spec b/releases/specs/s390/s390x/stage1-systemd.spec
new file mode 100644
index 00000000..cbdf2e44
--- /dev/null
+++ b/releases/specs/s390/s390x/stage1-systemd.spec
@@ -0,0 +1,12 @@
+subarch: s390x
+version_stamp: @TIMESTAMP@-systemd
+target: stage1
+rel_type: default
+profile: default/linux/s390/17.0/s390x/systemd
+snapshot: @TIMESTAMP@
+source_subpath: default/stage3-s390x-systemd-latest
+update_seed: yes
+update_seed_command: --update --deep --newuse @world
+compression_mode: pixz
+portage_confdir: @REPO_DIR@/releases/portage/stages
+pkgcache_path: /var/tmp/catalyst/packages/default/stage1-s390x
diff --git a/releases/specs/s390/s390x/stage3.spec b/releases/specs/s390/s390x/stage3-openrc.spec
index b545329b..4f742f46 100644
--- a/releases/specs/s390/s390x/stage3.spec
+++ b/releases/specs/s390/s390x/stage3-openrc.spec
@@ -1,10 +1,10 @@
 subarch: s390x
-version_stamp: @TIMESTAMP@
+version_stamp: @TIMESTAMP@-openrc
 target: stage3
 rel_type: default
 profile: default/linux/s390/17.0/s390x
 snapshot: @TIMESTAMP@
-source_subpath: default/stage1-s390x-@TIMESTAMP@
+source_subpath: default/stage1-s390x-openrc-@TIMESTAMP@
 compression_mode: pixz
 portage_confdir: @REPO_DIR@/releases/portage/stages
 pkgcache_path: /var/tmp/catalyst/packages/default/stage3-s390x
diff --git a/releases/specs/s390/s390x/stage3-systemd.spec b/releases/specs/s390/s390x/stage3-systemd.spec
new file mode 100644
index 00000000..c7fb7e81
--- /dev/null
+++ b/releases/specs/s390/s390x/stage3-systemd.spec
@@ -0,0 +1,10 @@
+subarch: s390x
+version_stamp: @TIMESTAMP@-systemd
+target: stage3
+rel_type: default
+profile: default/linux/s390/17.0/s390x/systemd
+snapshot: @TIMESTAMP@
+source_subpath: default/stage1-s390x-systemd-@TIMESTAMP@
+compression_mode: pixz
+portage_confdir: @REPO_DIR@/releases/portage/stages
+pkgcache_path: /var/tmp/catalyst/packages/default/stage3-s390x
diff --git a/tools/catalyst-auto-s390x.conf b/tools/catalyst-auto-s390x.conf
index b29d352f..a49156a5 100644
--- a/tools/catalyst-auto-s390x.conf
+++ b/tools/catalyst-auto-s390x.conf
@@ -4,13 +4,14 @@
 UPLOAD_USER=s390
 UPLOAD_KEY=/root/.ssh/id_rsa
 SPECS_DIR=${REPO_DIR}/releases/specs/s390/s390x
-SUBARCH=`grep subarch $SPECS_DIR/stage1.spec | awk '{print $2}'`
+SUBARCH=s390x
 
-SETS="default netboot"
+SETS="openrc systemd"
 
-SET_default_SPECS="stage1.spec stage3.spec"
+SET_openrc_SPECS="stage1-openrc.spec stage3-openrc.spec"
+SET_openrc_OPTIONAL_SPECS="netboot/netboot.spec"
 
-SET_netboot_SPECS="netboot/netboot.spec"
+SET_systemd_SPECS="stage1-systemd.spec stage3-systemd.spec"
 
 KCONFIG_DIR=${REPO_DIR}/releases/kconfig/s390
 
@@ -38,8 +39,11 @@ post_build() {
 		mv netboot2-s390x-${TIMESTAMP}/kernels/misc/netboot64.igz netboot2-s390x-${TIMESTAMP}/netboot-s390x-initramfs-${TIMESTAMP}
 		upload netboot2-s390x-${TIMESTAMP}/netboot*
 		;;
-	stage3.spec)
-		upload stage3-${SUBARCH}-*${TIMESTAMP}*.tar.xz*
+	stage3-openrc.spec)
+		upload stage3-${SUBARCH}-openrc-${TIMESTAMP}.tar.xz*
+		;;
+	stage3-systemd.spec)
+		upload stage3-${SUBARCH}-systemd-${TIMESTAMP}.tar.xz*
 		;;
 	*)
 		echo "Finished ${spec}"