commit: c5e8ae2dda8cb5c95c841955166ee631aa2302df
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 16 21:42:34 2022 +0000
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Wed Nov 16 21:42:34 2022 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=c5e8ae2d
Add ia64 systemd merged-usr build
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
releases/specs/ia64/stage1-systemd-mu.spec | 12 ++++++++++++
releases/specs/ia64/stage3-systemd-mu.spec | 10 ++++++++++
tools/catalyst-auto-ia64.conf | 5 ++++-
3 files changed, 26 insertions(+), 1 deletion(-)
diff --git a/releases/specs/ia64/stage1-systemd-mu.spec
b/releases/specs/ia64/stage1-systemd-mu.spec
new file mode 100644
index 00000000..b3939d02
--- /dev/null
+++ b/releases/specs/ia64/stage1-systemd-mu.spec
@@ -0,0 +1,12 @@
+subarch: ia64
+version_stamp: systemd-mergedusr-@TIMESTAMP@
+target: stage1
+rel_type: default
+profile: default/linux/ia64/17.0/systemd/merged-usr
+snapshot: @TIMESTAMP@
+source_subpath: default/stage3-ia64-systemd-mergedusr-latest
+compression_mode: pixz
+update_seed: no
+update_seed_command: --update --deep --newuse @world
+portage_confdir: @REPO_DIR@/releases/portage/stages
+portage_prefix: releng
diff --git a/releases/specs/ia64/stage3-systemd-mu.spec
b/releases/specs/ia64/stage3-systemd-mu.spec
new file mode 100644
index 00000000..02619c36
--- /dev/null
+++ b/releases/specs/ia64/stage3-systemd-mu.spec
@@ -0,0 +1,10 @@
+subarch: ia64
+version_stamp: systemd-mergedusr-@TIMESTAMP@
+target: stage3
+rel_type: default
+profile: default/linux/ia64/17.0/systemd/merged-usr
+snapshot: @TIMESTAMP@
+source_subpath: default/stage1-ia64-systemd-mergedusr-@TIMESTAMP@
+compression_mode: pixz
+portage_confdir: @REPO_DIR@/releases/portage/stages
+portage_prefix: releng
diff --git a/tools/catalyst-auto-ia64.conf b/tools/catalyst-auto-ia64.conf
index 114d71f1..ba74d35c 100644
--- a/tools/catalyst-auto-ia64.conf
+++ b/tools/catalyst-auto-ia64.conf
@@ -5,7 +5,7 @@ UPLOAD_USER=ia64
UPLOAD_KEY=/root/.ssh/id_rsa
SPECS_DIR=${REPO_DIR}/releases/specs/ia64
-SPECS="stage1-openrc.spec stage3-openrc.spec stage1-systemd.spec
stage3-systemd.spec"
+SPECS="stage1-openrc.spec stage3-openrc.spec stage1-systemd.spec
stage3-systemd.spec stage1-systemd-mu.spec stage3-systemd-mu.spec"
OPTIONAL_SPECS="installcd-stage1.spec installcd-stage2-minimal.spec"
KCONFIG_DIR=${REPO_DIR}/releases/kconfig/ia64
@@ -38,6 +38,9 @@ post_build() {
stage3-systemd.spec)
upload stage3-*systemd-${TIMESTAMP}*.xz*
;;
+ stage3-systemd-mu.spec)
+ upload stage3-*systemd-mergedusr-${TIMESTAMP}*.xz*
+ ;;
*)
echo "Finished ${spec}"
;;
