commit: 6a5d738eccf344e99af7f60a1d30c5d41126d155
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Mon Nov 21 20:48:52 2022 +0000
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Mon Nov 21 20:48:52 2022 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=6a5d738e
amd64: Add more merged-usr builds
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
releases/specs/amd64/clang/stage1-systemd-mu.spec | 12 ++++++++++++
releases/specs/amd64/clang/stage3-systemd-mu.spec | 10 ++++++++++
releases/specs/amd64/nomultilib/stage1-systemd-mu.spec | 12 ++++++++++++
releases/specs/amd64/nomultilib/stage3-systemd-mu.spec | 10 ++++++++++
tools/catalyst-auto-amd64.conf | 13 +++++++++++++
5 files changed, 57 insertions(+)
diff --git a/releases/specs/amd64/clang/stage1-systemd-mu.spec
b/releases/specs/amd64/clang/stage1-systemd-mu.spec
new file mode 100644
index 00000000..08169f1c
--- /dev/null
+++ b/releases/specs/amd64/clang/stage1-systemd-mu.spec
@@ -0,0 +1,12 @@
+subarch: amd64
+target: stage1
+version_stamp: llvm-systemd-mergedusr-@TIMESTAMP@
+rel_type: clang
+profile: default/linux/amd64/17.1/systemd/clang/merged-usr
+snapshot: @TIMESTAMP@
+source_subpath: clang/stage3-amd64-llvm-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/clang/stage3-systemd-mu.spec
b/releases/specs/amd64/clang/stage3-systemd-mu.spec
new file mode 100644
index 00000000..7a195566
--- /dev/null
+++ b/releases/specs/amd64/clang/stage3-systemd-mu.spec
@@ -0,0 +1,10 @@
+subarch: amd64
+target: stage3
+version_stamp: llvm-systemd-mergedusr-@TIMESTAMP@
+rel_type: clang
+profile: default/linux/amd64/17.1/systemd/clang/merged-usr
+snapshot: @TIMESTAMP@
+source_subpath: clang/stage1-amd64-llvm-systemd-mergedusr-@TIMESTAMP@
+compression_mode: pixz
+portage_confdir: @REPO_DIR@/releases/portage/stages
+portage_prefix: releng
diff --git a/releases/specs/amd64/nomultilib/stage1-systemd-mu.spec
b/releases/specs/amd64/nomultilib/stage1-systemd-mu.spec
new file mode 100644
index 00000000..5f5fe96b
--- /dev/null
+++ b/releases/specs/amd64/nomultilib/stage1-systemd-mu.spec
@@ -0,0 +1,12 @@
+subarch: amd64
+target: stage1
+version_stamp: nomultilib-systemd-mergedusr-@TIMESTAMP@
+rel_type: default
+profile: default/linux/amd64/17.1/no-multilib/systemd/merged-usr
+snapshot: @TIMESTAMP@
+source_subpath: default/stage3-amd64-nomultilib-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/nomultilib/stage3-systemd-mu.spec
b/releases/specs/amd64/nomultilib/stage3-systemd-mu.spec
new file mode 100644
index 00000000..fa416f80
--- /dev/null
+++ b/releases/specs/amd64/nomultilib/stage3-systemd-mu.spec
@@ -0,0 +1,10 @@
+subarch: amd64
+target: stage3
+version_stamp: nomultilib-systemd-mergedusr-@TIMESTAMP@
+rel_type: default
+profile: default/linux/amd64/17.1/no-multilib/systemd/merged-usr
+snapshot: @TIMESTAMP@
+source_subpath: default/stage1-amd64-nomultilib-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 b2495007..27578c1f 100644
--- a/tools/catalyst-auto-amd64.conf
+++ b/tools/catalyst-auto-amd64.conf
@@ -16,8 +16,10 @@ SETS="
livegui
nomultilib_openrc
nomultilib_systemd
+ nomultilib_systemd_mu
llvm_openrc
llvm_systemd
+ llvm_systemd_mu
hardened_openrc
hardened_nomultilib_openrc
hardened_selinux_openrc
@@ -48,12 +50,17 @@
SET_hardened_nomultilib_selinux_openrc_SPECS="hardened-nomultilib-selinux/stage1
SET_hardened_nomultilib_openrc_SPECS="hardened-nomultilib/stage1-openrc.spec
hardened-nomultilib/stage3-openrc.spec"
SET_nomultilib_openrc_SPECS="nomultilib/stage1-openrc.spec
nomultilib/stage3-openrc.spec"
+
SET_nomultilib_systemd_SPECS="nomultilib/stage1-systemd.spec
nomultilib/stage3-systemd.spec"
+SET_nomultilib_systemd_mu_SPECS="nomultilib/stage1-systemd-mu.spec
nomultilib/stage3-systemd-mu.spec"
+
SET_llvm_openrc_SPECS="clang/stage1-openrc.spec clang/stage3-openrc.spec"
SET_llvm_systemd_SPECS="clang/stage1-systemd.spec clang/stage3-systemd.spec"
+SET_llvm_systemd_mu_SPECS="clang/stage1-systemd-mu.spec
clang/stage3-systemd-mu.spec"
+
SET_musl_SPECS="musl/stage1.spec musl/stage3.spec"
SET_musl_llvm_SPECS="musl-clang/stage1.spec musl-clang/stage3.spec"
@@ -117,6 +124,9 @@ post_build() {
nomultilib/stage3-systemd.spec)
upload stage3-amd64-nomultilib-systemd-${TIMESTAMP}.tar.xz*
;;
+ nomultilib/stage3-systemd-mu.spec)
+ upload
stage3-amd64-nomultilib-systemd-mergedusr-${TIMESTAMP}.tar.xz*
+ ;;
x32/stage3-openrc.spec)
upload stage3-x32-openrc-${TIMESTAMP}.tar.xz*
;;
@@ -134,6 +144,9 @@ post_build() {
clang/stage3-systemd.spec)
upload stage3-amd64-llvm-systemd-${TIMESTAMP}.tar.xz*
;;
+ clang/stage3-systemd-mu.spec)
+ upload stage3-amd64-llvm-systemd-mergedusr-${TIMESTAMP}.tar.xz*
+ ;;
esac
popd >/dev/null || exit
