commit: 98b8d9474d486d0c609ae6400d39e2ff768b9631
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Fri Apr 22 19:16:59 2022 +0000
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Fri Apr 22 19:16:59 2022 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=98b8d947
hppa11: also rename openrc and add systemd
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
.../specs/hppa/hppa1.1/{stage1.spec => stage1-openrc.spec} | 4 ++--
.../specs/hppa/hppa1.1/{stage1.spec => stage1-systemd.spec} | 6 +++---
releases/specs/hppa/hppa1.1/stage2.spec | 10 ----------
.../specs/hppa/hppa1.1/{stage3.spec => stage3-openrc.spec} | 4 ++--
.../specs/hppa/hppa1.1/{stage3.spec => stage3-systemd.spec} | 6 +++---
tools/catalyst-auto-hppa.conf | 12 ++++++++----
6 files changed, 18 insertions(+), 24 deletions(-)
diff --git a/releases/specs/hppa/hppa1.1/stage1.spec
b/releases/specs/hppa/hppa1.1/stage1-openrc.spec
similarity index 75%
copy from releases/specs/hppa/hppa1.1/stage1.spec
copy 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.spec
b/releases/specs/hppa/hppa1.1/stage1-systemd.spec
similarity index 63%
rename from releases/specs/hppa/hppa1.1/stage1.spec
rename to releases/specs/hppa/hppa1.1/stage1-systemd.spec
index 10bb05c8..36d8075b 100644
--- a/releases/specs/hppa/hppa1.1/stage1.spec
+++ b/releases/specs/hppa/hppa1.1/stage1-systemd.spec
@@ -1,10 +1,10 @@
subarch: hppa1.1
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-hppa1.1-latest
+source_subpath: default/stage3-hppa1.1-systemd-latest
update_seed: yes
portage_confdir: @REPO_DIR@/releases/portage/stages
portage_prefix: releng
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%
copy from releases/specs/hppa/hppa1.1/stage3.spec
copy 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.spec
b/releases/specs/hppa/hppa1.1/stage3-systemd.spec
similarity index 61%
rename from releases/specs/hppa/hppa1.1/stage3.spec
rename to releases/specs/hppa/hppa1.1/stage3-systemd.spec
index 2fc09990..5720d021 100644
--- a/releases/specs/hppa/hppa1.1/stage3.spec
+++ b/releases/specs/hppa/hppa1.1/stage3-systemd.spec
@@ -1,10 +1,10 @@
subarch: hppa1.1
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-hppa1.1-@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*
