commit: 8cd7cbb4d170ec9112481605c3774eeb84dcf6ca
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 27 11:57:23 2022 +0000
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sun Nov 27 11:57:23 2022 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=8cd7cbb4
Add x32 systemd mergedusr build
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
releases/specs/amd64/x32/stage1-systemd-mu.spec | 12 ++++++++++++
releases/specs/amd64/x32/stage3-systemd-mu.spec | 10 ++++++++++
tools/catalyst-auto-amd64.conf | 6 ++++++
3 files changed, 28 insertions(+)
diff --git a/releases/specs/amd64/x32/stage1-systemd-mu.spec
b/releases/specs/amd64/x32/stage1-systemd-mu.spec
new file mode 100644
index 00000000..c42dfd7c
--- /dev/null
+++ b/releases/specs/amd64/x32/stage1-systemd-mu.spec
@@ -0,0 +1,12 @@
+subarch: x32
+target: stage1
+version_stamp: systemd-mergedusr-@TIMESTAMP@
+rel_type: mergedusr
+profile: default/linux/amd64/17.0/x32/systemd/merged-usr
+snapshot: @TIMESTAMP@
+source_subpath: default/stage3-x32-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/amd64/x32/stage3-systemd-mu.spec
b/releases/specs/amd64/x32/stage3-systemd-mu.spec
new file mode 100644
index 00000000..1a4ecced
--- /dev/null
+++ b/releases/specs/amd64/x32/stage3-systemd-mu.spec
@@ -0,0 +1,10 @@
+subarch: x32
+target: stage3
+version_stamp: systemd-mergedusr-@TIMESTAMP@
+rel_type: mergedusr
+profile: default/linux/amd64/17.0/x32/systemd/merged-usr
+snapshot: @TIMESTAMP@
+source_subpath: default/stage1-x32-systemd-mergedusr-@TIMESTAMP@
+compression_mode: pixz
+portage_confdir: @REPO_DIR@/releases/portage/stages
+portage_prefix: releng
diff --git a/tools/catalyst-auto-amd64.conf b/tools/catalyst-auto-amd64.conf
index 5fc56439..544bc40d 100644
--- a/tools/catalyst-auto-amd64.conf
+++ b/tools/catalyst-auto-amd64.conf
@@ -29,6 +29,7 @@ SETS="
musl_llvm
x32_openrc
x32_systemd
+ x32_systemd_mu
"
SET_openrc_SPECS="stage1-openrc.spec stage3-openrc.spec"
@@ -72,6 +73,8 @@ SET_x32_openrc_SPECS="x32/stage1-openrc.spec
x32/stage3-openrc.spec"
SET_x32_systemd_SPECS="x32/stage1-systemd.spec x32/stage3-systemd.spec"
+SET_x32_systemd_mu_SPECS="x32/stage1-systemd-mu.spec
x32/stage3-systemd-mu.spec"
+
KCONFIG_DIR=${REPO_DIR}/releases/kconfig/amd64
EXTENSIONS="@(.tar.xz|.tar.bz2|.tar.gz|.tar|.sfs)"
@@ -145,6 +148,9 @@ post_build() {
nomultilib/stage3-systemd-mu.spec)
upload
stage3-amd64-nomultilib-systemd-mergedusr-${TIMESTAMP}.tar.xz*
;;
+ x32/stage3-systemd-mu.spec)
+ upload stage3-x32-systemd-mergedusr-${TIMESTAMP}.tar.xz*
+ ;;
esac
popd >/dev/null || exit
