From b6054111f10a5727627c92c18cb0a54d28ae5fd0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20K=2E=20H=C3=BCttel?= <dilfridge@gentoo.org>
Date: Fri, 22 Apr 2022 21:04:58 +0200
Subject: [PATCH] hppa20: rename openrc stages and add systemd stages
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/hppa/hppa2.0/stage1-openrc.spec  |  4 ++--
 releases/specs/hppa/hppa2.0/stage1-systemd.spec | 11 +++++++++++
 releases/specs/hppa/hppa2.0/stage3-openrc.spec  |  4 ++--
 releases/specs/hppa/hppa2.0/stage3-systemd.spec | 10 ++++++++++
 tools/catalyst-auto-hppa.conf                   | 10 +++++++---
 5 files changed, 32 insertions(+), 7 deletions(-)
 create mode 100644 releases/specs/hppa/hppa2.0/stage1-systemd.spec
 create mode 100644 releases/specs/hppa/hppa2.0/stage3-systemd.spec

diff --git a/releases/specs/hppa/hppa2.0/stage1-openrc.spec b/releases/specs/hppa/hppa2.0/stage1-openrc.spec
index 7b57ffbf..da47be10 100644
--- a/releases/specs/hppa/hppa2.0/stage1-openrc.spec
+++ b/releases/specs/hppa/hppa2.0/stage1-openrc.spec
@@ -1,10 +1,10 @@
 subarch: hppa2.0
 target: stage1
-version_stamp: @TIMESTAMP@
+version_stamp: openrc-@TIMESTAMP@
 rel_type: default
 profile: default/linux/hppa/17.0
 snapshot: @TIMESTAMP@
-source_subpath: default/stage3-hppa2.0-latest
+source_subpath: default/stage3-hppa2.0-openrc-latest
 update_seed: yes
 portage_confdir: @REPO_DIR@/releases/portage/stages
 portage_prefix: releng
diff --git a/releases/specs/hppa/hppa2.0/stage1-systemd.spec b/releases/specs/hppa/hppa2.0/stage1-systemd.spec
new file mode 100644
index 00000000..c4bf7f45
--- /dev/null
+++ b/releases/specs/hppa/hppa2.0/stage1-systemd.spec
@@ -0,0 +1,11 @@
+subarch: hppa2.0
+target: stage1
+version_stamp: systemd-@TIMESTAMP@
+rel_type: default
+profile: default/linux/hppa/17.0/systemd
+snapshot: @TIMESTAMP@
+source_subpath: default/stage3-hppa2.0-systemd-latest
+update_seed: yes
+portage_confdir: @REPO_DIR@/releases/portage/stages
+portage_prefix: releng
+pkgcache_path: /var/tmp/catalyst/packages/default/stage1-hppa2.0
diff --git a/releases/specs/hppa/hppa2.0/stage3-openrc.spec b/releases/specs/hppa/hppa2.0/stage3-openrc.spec
index 90fad405..caffba0c 100644
--- a/releases/specs/hppa/hppa2.0/stage3-openrc.spec
+++ b/releases/specs/hppa/hppa2.0/stage3-openrc.spec
@@ -1,10 +1,10 @@
 subarch: hppa2.0
 target: stage3
-version_stamp: @TIMESTAMP@
+version_stamp: openrc-@TIMESTAMP@
 rel_type: default
 profile: default/linux/hppa/17.0
 snapshot: @TIMESTAMP@
-source_subpath: default/stage1-hppa2.0-@TIMESTAMP@
+source_subpath: default/stage1-hppa2.0-openrc-@TIMESTAMP@
 portage_confdir: @REPO_DIR@/releases/portage/stages
 portage_prefix: releng
 pkgcache_path: /var/tmp/catalyst/packages/default/stage3-hppa2.0
diff --git a/releases/specs/hppa/hppa2.0/stage3-systemd.spec b/releases/specs/hppa/hppa2.0/stage3-systemd.spec
new file mode 100644
index 00000000..6d716ca2
--- /dev/null
+++ b/releases/specs/hppa/hppa2.0/stage3-systemd.spec
@@ -0,0 +1,10 @@
+subarch: hppa2.0
+target: stage3
+version_stamp: systemd-@TIMESTAMP@
+rel_type: default
+profile: default/linux/hppa/17.0/systemd
+snapshot: @TIMESTAMP@
+source_subpath: default/stage1-hppa2.0-systemd-@TIMESTAMP@
+portage_confdir: @REPO_DIR@/releases/portage/stages
+portage_prefix: releng
+pkgcache_path: /var/tmp/catalyst/packages/default/stage3-hppa2.0
diff --git a/tools/catalyst-auto-hppa.conf b/tools/catalyst-auto-hppa.conf
index f485325d..c430d906 100644
--- a/tools/catalyst-auto-hppa.conf
+++ b/tools/catalyst-auto-hppa.conf
@@ -5,11 +5,12 @@ UPLOAD_USER=hppa
 UPLOAD_KEY=/root/.ssh/buildsync.key
 SPECS_DIR=${REPO_DIR}/releases/specs/hppa
 
-SETS="hppa1_1 hppa2_0 hppa_livecd hppa_netboot"
+SETS="hppa1_1 hppa20_openrc hppa20_systemd hppa_livecd hppa_netboot"
 
 SET_hppa1_1_SPECS="hppa1.1/stage1.spec hppa1.1/stage3.spec"
 
-SET_hppa2_0_SPECS="hppa2.0/stage1-openrc.spec hppa2.0/stage3-openrc.spec"
+SET_hppa20_openrc_SPECS="hppa2.0/stage1-openrc.spec hppa2.0/stage3-openrc.spec"
+SET_hppa20_systemd_SPECS="hppa2.0/stage1-systemd.spec hppa2.0/stage3-systemd.spec"
 
 SET_hppa_livecd_SPECS="installcd-stage1.spec installcd-stage2-minimal.spec"
 
@@ -55,7 +56,10 @@ post_build() {
 		upload stage3-hppa1.1-*${TIMESTAMP}*.bz2*
 		;;
 	hppa2.0/stage3-openrc.spec)
-		upload stage3-hppa2.0-*${TIMESTAMP}*.bz2*
+		upload stage3-hppa2.0-openrc-*${TIMESTAMP}*.bz2*
+		;;
+	hppa2.0/stage3-systemd.spec)
+		upload stage3-hppa2.0-systemd-*${TIMESTAMP}*.bz2*
 		;;
 	*)
 		echo "Finished ${spec}"