From 64a00207f3eac64f8371251434d52e3c96910f54 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20K=2E=20H=C3=BCttel?= Date: Thu, 29 Dec 2022 23:36:03 +0100 Subject: [PATCH] Add amd64 desktop systemd mu stage MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Andreas K. Hüttel --- releases/specs/amd64/stage3d-systemd-mu.spec | 10 ++++++++++ tools/catalyst-auto-amd64.conf | 4 ++++ 2 files changed, 14 insertions(+) create mode 100644 releases/specs/amd64/stage3d-systemd-mu.spec diff --git a/releases/specs/amd64/stage3d-systemd-mu.spec b/releases/specs/amd64/stage3d-systemd-mu.spec new file mode 100644 index 00000000..369e255e --- /dev/null +++ b/releases/specs/amd64/stage3d-systemd-mu.spec @@ -0,0 +1,10 @@ +subarch: amd64 +target: stage3 +version_stamp: desktop-systemd-mergedusr-@TIMESTAMP@ +rel_type: mergedusr +profile: default/linux/amd64/17.1/desktop/systemd/merged-usr +snapshot: @TIMESTAMP@ +source_subpath: mergedusr/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 544bc40d..478ed5ba 100644 --- a/tools/catalyst-auto-amd64.conf +++ b/tools/catalyst-auto-amd64.conf @@ -41,6 +41,7 @@ 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_systemd_mu_OPTIONAL_SPECS="stage3d-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" @@ -145,6 +146,9 @@ post_build() { stage3-systemd-mu.spec) upload stage3-amd64-systemd-mergedusr-${TIMESTAMP}.tar.xz* ;; + stage3d-systemd-mu.spec) + upload stage3-amd64-desktop-systemd-mergedusr-${TIMESTAMP}.tar.xz* + ;; nomultilib/stage3-systemd-mu.spec) upload stage3-amd64-nomultilib-systemd-mergedusr-${TIMESTAMP}.tar.xz* ;;