From 98b8d9474d486d0c609ae6400d39e2ff768b9631 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20K=2E=20H=C3=BCttel?= Date: Fri, 22 Apr 2022 21:16:59 +0200 Subject: [PATCH] hppa11: also rename openrc and add systemd MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Andreas K. Hüttel --- .../hppa/hppa1.1/{stage1.spec => stage1-openrc.spec} | 4 ++-- releases/specs/hppa/hppa1.1/stage1-systemd.spec | 11 +++++++++++ releases/specs/hppa/hppa1.1/stage2.spec | 10 ---------- .../hppa/hppa1.1/{stage3.spec => stage3-openrc.spec} | 4 ++-- releases/specs/hppa/hppa1.1/stage3-systemd.spec | 10 ++++++++++ tools/catalyst-auto-hppa.conf | 12 ++++++++---- 6 files changed, 33 insertions(+), 18 deletions(-) rename releases/specs/hppa/hppa1.1/{stage1.spec => stage1-openrc.spec} (75%) create mode 100644 releases/specs/hppa/hppa1.1/stage1-systemd.spec delete mode 100644 releases/specs/hppa/hppa1.1/stage2.spec rename releases/specs/hppa/hppa1.1/{stage3.spec => stage3-openrc.spec} (72%) create mode 100644 releases/specs/hppa/hppa1.1/stage3-systemd.spec diff --git a/releases/specs/hppa/hppa1.1/stage1.spec b/releases/specs/hppa/hppa1.1/stage1-openrc.spec similarity index 75% rename from releases/specs/hppa/hppa1.1/stage1.spec rename to releases/specs/hppa/hppa1.1/stage1-openrc.spec index 10bb05c8..d7fad4b7 100644 --- a/releases/specs/hppa/hppa1.1/stage1.spec +++ b/releases/specs/hppa/hppa1.1/stage1-openrc.spec @@ -1,10 +1,10 @@ subarch: hppa1.1 target: stage1 -version_stamp: @TIMESTAMP@ +version_stamp: openrc-@TIMESTAMP@ rel_type: default profile: default/linux/hppa/17.0 snapshot: @TIMESTAMP@ -source_subpath: default/stage3-hppa1.1-latest +source_subpath: default/stage3-hppa1.1-openrc-latest update_seed: yes portage_confdir: @REPO_DIR@/releases/portage/stages portage_prefix: releng diff --git a/releases/specs/hppa/hppa1.1/stage1-systemd.spec b/releases/specs/hppa/hppa1.1/stage1-systemd.spec new file mode 100644 index 00000000..36d8075b --- /dev/null +++ b/releases/specs/hppa/hppa1.1/stage1-systemd.spec @@ -0,0 +1,11 @@ +subarch: hppa1.1 +target: stage1 +version_stamp: systemd-@TIMESTAMP@ +rel_type: default +profile: default/linux/hppa/17.0/systemd +snapshot: @TIMESTAMP@ +source_subpath: default/stage3-hppa1.1-systemd-latest +update_seed: yes +portage_confdir: @REPO_DIR@/releases/portage/stages +portage_prefix: releng +pkgcache_path: /var/tmp/catalyst/packages/default/stage1-hppa1.1 diff --git a/releases/specs/hppa/hppa1.1/stage2.spec b/releases/specs/hppa/hppa1.1/stage2.spec deleted file mode 100644 index d32cd0d9..00000000 --- a/releases/specs/hppa/hppa1.1/stage2.spec +++ /dev/null @@ -1,10 +0,0 @@ -subarch: hppa1.1 -target: stage2 -version_stamp: @TIMESTAMP@ -rel_type: default -profile: default/linux/hppa/17.0 -snapshot: @TIMESTAMP@ -source_subpath: default/stage1-hppa1.1-@TIMESTAMP@ -portage_confdir: @REPO_DIR@/releases/portage/stages -portage_prefix: releng -pkgcache_path: /var/tmp/catalyst/packages/default/stage2-hppa1.1 diff --git a/releases/specs/hppa/hppa1.1/stage3.spec b/releases/specs/hppa/hppa1.1/stage3-openrc.spec similarity index 72% rename from releases/specs/hppa/hppa1.1/stage3.spec rename to releases/specs/hppa/hppa1.1/stage3-openrc.spec index 2fc09990..37bb63b2 100644 --- a/releases/specs/hppa/hppa1.1/stage3.spec +++ b/releases/specs/hppa/hppa1.1/stage3-openrc.spec @@ -1,10 +1,10 @@ subarch: hppa1.1 target: stage3 -version_stamp: @TIMESTAMP@ +version_stamp: openrc-@TIMESTAMP@ rel_type: default profile: default/linux/hppa/17.0 snapshot: @TIMESTAMP@ -source_subpath: default/stage1-hppa1.1-@TIMESTAMP@ +source_subpath: default/stage1-hppa1.1-openrc-@TIMESTAMP@ portage_confdir: @REPO_DIR@/releases/portage/stages portage_prefix: releng pkgcache_path: /var/tmp/catalyst/packages/default/stage3-hppa1.1 diff --git a/releases/specs/hppa/hppa1.1/stage3-systemd.spec b/releases/specs/hppa/hppa1.1/stage3-systemd.spec new file mode 100644 index 00000000..5720d021 --- /dev/null +++ b/releases/specs/hppa/hppa1.1/stage3-systemd.spec @@ -0,0 +1,10 @@ +subarch: hppa1.1 +target: stage3 +version_stamp: systemd-@TIMESTAMP@ +rel_type: default +profile: default/linux/hppa/17.0/systemd +snapshot: @TIMESTAMP@ +source_subpath: default/stage1-hppa1.1-systemd-@TIMESTAMP@ +portage_confdir: @REPO_DIR@/releases/portage/stages +portage_prefix: releng +pkgcache_path: /var/tmp/catalyst/packages/default/stage3-hppa1.1 diff --git a/tools/catalyst-auto-hppa.conf b/tools/catalyst-auto-hppa.conf index c430d906..c71d6f2a 100644 --- a/tools/catalyst-auto-hppa.conf +++ b/tools/catalyst-auto-hppa.conf @@ -5,9 +5,10 @@ UPLOAD_USER=hppa UPLOAD_KEY=/root/.ssh/buildsync.key SPECS_DIR=${REPO_DIR}/releases/specs/hppa -SETS="hppa1_1 hppa20_openrc hppa20_systemd hppa_livecd hppa_netboot" +SETS="hppa11_openrc hppa11_systemd hppa20_openrc hppa20_systemd hppa_livecd hppa_netboot" -SET_hppa1_1_SPECS="hppa1.1/stage1.spec hppa1.1/stage3.spec" +SET_hppa11_openrc_SPECS="hppa1.1/stage1-openrc.spec hppa1.1/stage3-openrc.spec" +SET_hppa11_systemd_SPECS="hppa1.1/stage1-systemd.spec hppa1.1/stage3-systemd.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" @@ -52,8 +53,11 @@ post_build() { installcd-stage2-minimal.spec) upload install-hppa-minimal-*${TIMESTAMP}*.iso* ;; - hppa1.1/stage3.spec) - upload stage3-hppa1.1-*${TIMESTAMP}*.bz2* + hppa1.1/stage3-openrc.spec) + upload stage3-hppa1.1-openrc-*${TIMESTAMP}*.bz2* + ;; + hppa1.1/stage3-systemd.spec) + upload stage3-hppa1.1-systemd-*${TIMESTAMP}*.bz2* ;; hppa2.0/stage3-openrc.spec) upload stage3-hppa2.0-openrc-*${TIMESTAMP}*.bz2*