commit: a1175db1091cdebc82da57d792a5b48e7db5c0ea
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Sat Nov 19 14:23:34 2022 +0000
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sat Nov 19 14:23:34 2022 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=a1175db1
Add x86 systemd merged-usr specs
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
releases/specs/x86/i686/stage1-systemd-mu.spec | 12 ++++++++++++
releases/specs/x86/i686/stage3-systemd-mu.spec | 10 ++++++++++
tools/catalyst-auto-x86.conf | 5 +++++
3 files changed, 27 insertions(+)
diff --git a/releases/specs/x86/i686/stage1-systemd-mu.spec
b/releases/specs/x86/i686/stage1-systemd-mu.spec
new file mode 100644
index 00000000..d7bb1aab
--- /dev/null
+++ b/releases/specs/x86/i686/stage1-systemd-mu.spec
@@ -0,0 +1,12 @@
+subarch: i686
+target: stage1
+version_stamp: systemd-mergedusr-@TIMESTAMP@
+rel_type: default
+profile: default/linux/x86/17.0/systemd/merged-usr
+snapshot: @TIMESTAMP@
+source_subpath: default/stage3-i686-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/x86/i686/stage3-systemd-mu.spec
b/releases/specs/x86/i686/stage3-systemd-mu.spec
new file mode 100644
index 00000000..22a40f2c
--- /dev/null
+++ b/releases/specs/x86/i686/stage3-systemd-mu.spec
@@ -0,0 +1,10 @@
+subarch: i686
+target: stage3
+version_stamp: systemd-mergedusr-@TIMESTAMP@
+rel_type: default
+profile: default/linux/x86/17.0/systemd/merged-usr
+snapshot: @TIMESTAMP@
+source_subpath: default/stage1-i686-systemd-mergedusr-@TIMESTAMP@
+compression_mode: pixz
+portage_confdir: @REPO_DIR@/releases/portage/stages
+portage_prefix: releng
diff --git a/tools/catalyst-auto-x86.conf b/tools/catalyst-auto-x86.conf
index b0a70c76..4a740f57 100644
--- a/tools/catalyst-auto-x86.conf
+++ b/tools/catalyst-auto-x86.conf
@@ -13,6 +13,7 @@ SETS="
i486_openrc
i686_openrc
i686_systemd
+ i686_systemd_mu
hardened_openrc
musl
"
@@ -22,6 +23,7 @@
SET_i486_openrc_OPTIONAL_SPECS="i486/installcd-stage1-openrc.spec i486/installcd
SET_i686_openrc_SPECS="i686/stage1-openrc.spec i686/stage3-openrc.spec"
SET_i686_systemd_SPECS="i686/stage1-systemd.spec i686/stage3-systemd.spec"
+SET_i686_systemd_mu_SPECS="i686/stage1-systemd-mu.spec
i686/stage3-systemd-mu.spec"
SET_hardened_openrc_SPECS="hardened/stage1-openrc.spec
hardened/stage3-openrc.spec"
SET_hardened_openrc_OPTIONAL_SPECS="hardened/admincd-stage1-openrc.spec
hardened/admincd-stage2-openrc.spec"
@@ -71,6 +73,9 @@ post_build() {
i686/stage3-systemd.spec)
upload stage3-i686-systemd-${TIMESTAMP}.tar.xz*
;;
+ i686/stage3-systemd-mu.spec)
+ upload stage3-i686-systemd-mergedusr-${TIMESTAMP}.tar.xz*
+ ;;
esac
popd >/dev/null || exit
