* [gentoo-commits] proj/releng:master commit in: releases/specs/hppa/hppa1.1/, tools/, releases/specs/hppa/hppa2.0/
@ 2022-11-16 21:00 Andreas K. Hüttel
0 siblings, 0 replies; only message in thread
From: Andreas K. Hüttel @ 2022-11-16 21:00 UTC (permalink / raw
To: gentoo-commits
commit: c13e2dbe23d2b0b53cacacde1265f75d3486657f
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 16 20:58:26 2022 +0000
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Wed Nov 16 20:58:26 2022 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=c13e2dbe
Add hppa systemd merged-usr build
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
releases/specs/hppa/hppa1.1/stage1-systemd-mu.spec | 13 +++++++++++++
releases/specs/hppa/hppa1.1/stage3-systemd-mu.spec | 11 +++++++++++
releases/specs/hppa/hppa2.0/stage1-systemd-mu.spec | 13 +++++++++++++
releases/specs/hppa/hppa2.0/stage3-systemd-mu.spec | 11 +++++++++++
tools/catalyst-auto-hppa.conf | 12 +++++++++++-
5 files changed, 59 insertions(+), 1 deletion(-)
diff --git a/releases/specs/hppa/hppa1.1/stage1-systemd-mu.spec b/releases/specs/hppa/hppa1.1/stage1-systemd-mu.spec
new file mode 100644
index 00000000..2052398d
--- /dev/null
+++ b/releases/specs/hppa/hppa1.1/stage1-systemd-mu.spec
@@ -0,0 +1,13 @@
+subarch: hppa1.1
+target: stage1
+version_stamp: systemd-mergedusr-@TIMESTAMP@
+rel_type: default
+profile: default/linux/hppa/17.0/systemd/merged-usr
+snapshot: @TIMESTAMP@
+source_subpath: default/stage3-hppa1.1-systemd-mergedusr-latest
+update_seed: no
+portage_confdir: @REPO_DIR@/releases/portage/stages
+portage_prefix: releng
+compression_mode: pixz
+decompressor_search_order: xz bzip2
+update_seed_command: --update --deep --newuse @world
diff --git a/releases/specs/hppa/hppa1.1/stage3-systemd-mu.spec b/releases/specs/hppa/hppa1.1/stage3-systemd-mu.spec
new file mode 100644
index 00000000..c77da2ec
--- /dev/null
+++ b/releases/specs/hppa/hppa1.1/stage3-systemd-mu.spec
@@ -0,0 +1,11 @@
+subarch: hppa1.1
+target: stage3
+version_stamp: systemd-mergedusr-@TIMESTAMP@
+rel_type: default
+profile: default/linux/hppa/17.0/systemd/merged-usr
+snapshot: @TIMESTAMP@
+source_subpath: default/stage1-hppa1.1-systemd-mergedusr-@TIMESTAMP@
+portage_confdir: @REPO_DIR@/releases/portage/stages
+portage_prefix: releng
+compression_mode: pixz
+decompressor_search_order: xz bzip2
diff --git a/releases/specs/hppa/hppa2.0/stage1-systemd-mu.spec b/releases/specs/hppa/hppa2.0/stage1-systemd-mu.spec
new file mode 100644
index 00000000..1ba80ebd
--- /dev/null
+++ b/releases/specs/hppa/hppa2.0/stage1-systemd-mu.spec
@@ -0,0 +1,13 @@
+subarch: hppa2.0
+target: stage1
+version_stamp: systemd-mergedusr-@TIMESTAMP@
+rel_type: default
+profile: default/linux/hppa/17.0/systemd/merged-usr
+snapshot: @TIMESTAMP@
+source_subpath: default/stage3-hppa2.0-systemd-mergedusr-latest
+update_seed: no
+portage_confdir: @REPO_DIR@/releases/portage/stages
+portage_prefix: releng
+compression_mode: pixz
+decompressor_search_order: xz bzip2
+update_seed_command: --update --deep --newuse @world
diff --git a/releases/specs/hppa/hppa2.0/stage3-systemd-mu.spec b/releases/specs/hppa/hppa2.0/stage3-systemd-mu.spec
new file mode 100644
index 00000000..efec98ad
--- /dev/null
+++ b/releases/specs/hppa/hppa2.0/stage3-systemd-mu.spec
@@ -0,0 +1,11 @@
+subarch: hppa2.0
+target: stage3
+version_stamp: systemd-mergedusr-@TIMESTAMP@
+rel_type: default
+profile: default/linux/hppa/17.0/systemd/merged-usr
+snapshot: @TIMESTAMP@
+source_subpath: default/stage1-hppa2.0-systemd-mergedusr-@TIMESTAMP@
+portage_confdir: @REPO_DIR@/releases/portage/stages
+portage_prefix: releng
+compression_mode: pixz
+decompressor_search_order: xz bzip2
diff --git a/tools/catalyst-auto-hppa.conf b/tools/catalyst-auto-hppa.conf
index 8a4c06fe..0b00fc9c 100644
--- a/tools/catalyst-auto-hppa.conf
+++ b/tools/catalyst-auto-hppa.conf
@@ -5,18 +5,22 @@ UPLOAD_USER=hppa
UPLOAD_KEY=/root/.ssh/id_ed25519
SPECS_DIR=${REPO_DIR}/releases/specs/hppa
-SETS="hppa11_openrc hppa11_systemd hppa20_openrc hppa20_systemd"
+SETS="hppa11_openrc hppa11_systemd hppa11_systemd_mu hppa20_openrc hppa20_systemd hppa20_systemd_mu"
SET_hppa11_openrc_SPECS="hppa1.1/stage1-openrc.spec hppa1.1/stage3-openrc.spec"
SET_hppa11_openrc_OPTIONAL_SPECS="installcd-stage1.spec installcd-stage2-minimal.spec netboot-hppa32.spec"
SET_hppa11_systemd_SPECS="hppa1.1/stage1-systemd.spec hppa1.1/stage3-systemd.spec"
+SET_hppa11_systemd_mu_SPECS="hppa1.1/stage1-systemd-mu.spec hppa1.1/stage3-systemd-mu.spec"
+
SET_hppa20_openrc_SPECS="hppa2.0/stage1-openrc.spec hppa2.0/stage3-openrc.spec"
SET_hppa20_openrc_OPTIONAL_SPECS="netboot-hppa64.spec"
SET_hppa20_systemd_SPECS="hppa2.0/stage1-systemd.spec hppa2.0/stage3-systemd.spec"
+SET_hppa20_systemd_mu_SPECS="hppa2.0/stage1-systemd-mu.spec hppa2.0/stage3-systemd-mu.spec"
+
KCONFIG_DIR=${REPO_DIR}/releases/kconfig/hppa
EMAIL_SUBJECT_PREPEND="[hppa-auto]"
@@ -59,12 +63,18 @@ post_build() {
hppa1.1/stage3-systemd.spec)
upload stage3-hppa1.1-systemd-*${TIMESTAMP}*.xz*
;;
+ hppa1.1/stage3-systemd-mu.spec)
+ upload stage3-hppa1.1-systemd-mergedusr-*${TIMESTAMP}*.xz*
+ ;;
hppa2.0/stage3-openrc.spec)
upload stage3-hppa2.0-openrc-*${TIMESTAMP}*.xz*
;;
hppa2.0/stage3-systemd.spec)
upload stage3-hppa2.0-systemd-*${TIMESTAMP}*.xz*
;;
+ hppa2.0/stage3-systemd-mu.spec)
+ upload stage3-hppa2.0-systemd-mergedusr-*${TIMESTAMP}*.xz*
+ ;;
*)
echo "Finished ${spec}"
;;
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2022-11-16 21:00 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-11-16 21:00 [gentoo-commits] proj/releng:master commit in: releases/specs/hppa/hppa1.1/, 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