diff --git a/releases/specs/amd64/stage1-systemd-mu.spec b/releases/specs/amd64/stage1-systemd-mu.spec new file mode 100644 index 00000000..3e97cf93 --- /dev/null +++ b/releases/specs/amd64/stage1-systemd-mu.spec @@ -0,0 +1,12 @@ +subarch: amd64 +target: stage1 +version_stamp: systemd-mergedusr-@TIMESTAMP@ +rel_type: default +profile: default/linux/amd64/17.1/systemd/merged-usr +snapshot: @TIMESTAMP@ +source_subpath: default/stage3-amd64-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/stage3-systemd-mu.spec b/releases/specs/amd64/stage3-systemd-mu.spec new file mode 100644 index 00000000..2d710c99 --- /dev/null +++ b/releases/specs/amd64/stage3-systemd-mu.spec @@ -0,0 +1,10 @@ +subarch: amd64 +target: stage3 +version_stamp: systemd-mergedusr-@TIMESTAMP@ +rel_type: default +profile: default/linux/amd64/17.1/systemd/merged-usr +snapshot: @TIMESTAMP@ +source_subpath: default/stage1-amd64-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 e0a01f32..b2495007 100644 --- a/tools/catalyst-auto-amd64.conf +++ b/tools/catalyst-auto-amd64.conf @@ -12,6 +12,7 @@ SPECS_DIR=${REPO_DIR}/releases/specs/amd64 SETS=" openrc systemd + systemd_mu livegui nomultilib_openrc nomultilib_systemd @@ -35,6 +36,8 @@ SET_livegui_OPTIONAL_SPECS="livegui/livegui-stage1.spec livegui/livegui-stage2.s SET_systemd_SPECS="stage1-systemd.spec stage3-systemd.spec" SET_systemd_OPTIONAL_SPECS="stage3d-systemd.spec" +SET_systemd_mu_SPECS="stage1-systemd-mu.spec stage3-systemd-mu.spec" + SET_hardened_openrc_SPECS="hardened/stage1-openrc.spec hardened/stage3-openrc.spec" SET_hardened_openrc_OPTIONAL_SPECS="hardened/admincd-stage1.spec hardened/admincd-stage2.spec" @@ -96,6 +99,9 @@ post_build() { stage3-systemd.spec) upload stage3-amd64-systemd-${TIMESTAMP}.tar.xz* ;; + stage3-systemd-mu.spec) + upload stage3-amd64-systemd-mergedusr-${TIMESTAMP}.tar.xz* + ;; stage3d-openrc.spec) upload stage3-amd64-desktop-openrc-${TIMESTAMP}.tar.xz* ;;