* [gentoo-commits] proj/releng:master commit in: tools/, releases/specs/hppa/hppa2.0/
@ 2022-04-22 19:17 Andreas K. Hüttel
0 siblings, 0 replies; only message in thread
From: Andreas K. Hüttel @ 2022-04-22 19:17 UTC (permalink / raw
To: gentoo-commits
commit: b6054111f10a5727627c92c18cb0a54d28ae5fd0
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Fri Apr 22 19:04:58 2022 +0000
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Fri Apr 22 19:04:58 2022 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=b6054111
hppa20: rename openrc stages and add systemd stages
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
releases/specs/hppa/hppa2.0/stage1-openrc.spec | 4 ++--
.../hppa/hppa2.0/{stage1-openrc.spec => stage1-systemd.spec} | 6 +++---
releases/specs/hppa/hppa2.0/stage3-openrc.spec | 4 ++--
.../hppa/hppa2.0/{stage3-openrc.spec => stage3-systemd.spec} | 6 +++---
tools/catalyst-auto-hppa.conf | 10 +++++++---
5 files changed, 17 insertions(+), 13 deletions(-)
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-openrc.spec b/releases/specs/hppa/hppa2.0/stage1-systemd.spec
similarity index 63%
copy from releases/specs/hppa/hppa2.0/stage1-openrc.spec
copy to releases/specs/hppa/hppa2.0/stage1-systemd.spec
index 7b57ffbf..c4bf7f45 100644
--- a/releases/specs/hppa/hppa2.0/stage1-openrc.spec
+++ b/releases/specs/hppa/hppa2.0/stage1-systemd.spec
@@ -1,10 +1,10 @@
subarch: hppa2.0
target: stage1
-version_stamp: @TIMESTAMP@
+version_stamp: systemd-@TIMESTAMP@
rel_type: default
-profile: default/linux/hppa/17.0
+profile: default/linux/hppa/17.0/systemd
snapshot: @TIMESTAMP@
-source_subpath: default/stage3-hppa2.0-latest
+source_subpath: default/stage3-hppa2.0-systemd-latest
update_seed: yes
portage_confdir: @REPO_DIR@/releases/portage/stages
portage_prefix: releng
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-openrc.spec b/releases/specs/hppa/hppa2.0/stage3-systemd.spec
similarity index 61%
copy from releases/specs/hppa/hppa2.0/stage3-openrc.spec
copy to releases/specs/hppa/hppa2.0/stage3-systemd.spec
index 90fad405..6d716ca2 100644
--- a/releases/specs/hppa/hppa2.0/stage3-openrc.spec
+++ b/releases/specs/hppa/hppa2.0/stage3-systemd.spec
@@ -1,10 +1,10 @@
subarch: hppa2.0
target: stage3
-version_stamp: @TIMESTAMP@
+version_stamp: systemd-@TIMESTAMP@
rel_type: default
-profile: default/linux/hppa/17.0
+profile: default/linux/hppa/17.0/systemd
snapshot: @TIMESTAMP@
-source_subpath: default/stage1-hppa2.0-@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}"
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2022-04-22 19:17 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-04-22 19:17 [gentoo-commits] proj/releng:master commit in: tools/, releases/specs/hppa/hppa2.0/ Andreas K. Hüttel
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox