Gentoo Archives: gentoo-commits

From: "Andreas K. Hüttel" <dilfridge@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/releng:master commit in: releases/specs/amd64/, tools/
Date: Thu, 29 Dec 2022 22:36:43
Message-Id: 1672353390.64a00207f3eac64f8371251434d52e3c96910f54.dilfridge@gentoo
1 commit: 64a00207f3eac64f8371251434d52e3c96910f54
2 Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
3 AuthorDate: Thu Dec 29 22:36:03 2022 +0000
4 Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
5 CommitDate: Thu Dec 29 22:36:30 2022 +0000
6 URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=64a00207
7
8 Add amd64 desktop systemd mu stage
9
10 Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
11
12 releases/specs/amd64/stage3d-systemd-mu.spec | 10 ++++++++++
13 tools/catalyst-auto-amd64.conf | 4 ++++
14 2 files changed, 14 insertions(+)
15
16 diff --git a/releases/specs/amd64/stage3d-systemd-mu.spec b/releases/specs/amd64/stage3d-systemd-mu.spec
17 new file mode 100644
18 index 00000000..369e255e
19 --- /dev/null
20 +++ b/releases/specs/amd64/stage3d-systemd-mu.spec
21 @@ -0,0 +1,10 @@
22 +subarch: amd64
23 +target: stage3
24 +version_stamp: desktop-systemd-mergedusr-@TIMESTAMP@
25 +rel_type: mergedusr
26 +profile: default/linux/amd64/17.1/desktop/systemd/merged-usr
27 +snapshot: @TIMESTAMP@
28 +source_subpath: mergedusr/stage1-amd64-systemd-mergedusr-@TIMESTAMP@
29 +compression_mode: pixz
30 +portage_confdir: @REPO_DIR@/releases/portage/stages
31 +portage_prefix: releng
32
33 diff --git a/tools/catalyst-auto-amd64.conf b/tools/catalyst-auto-amd64.conf
34 index 544bc40d..478ed5ba 100644
35 --- a/tools/catalyst-auto-amd64.conf
36 +++ b/tools/catalyst-auto-amd64.conf
37 @@ -41,6 +41,7 @@ SET_systemd_SPECS="stage1-systemd.spec stage3-systemd.spec"
38 SET_systemd_OPTIONAL_SPECS="stage3d-systemd.spec"
39
40 SET_systemd_mu_SPECS="stage1-systemd-mu.spec stage3-systemd-mu.spec"
41 +SET_systemd_mu_OPTIONAL_SPECS="stage3d-systemd-mu.spec"
42
43 SET_hardened_openrc_SPECS="hardened/stage1-openrc.spec hardened/stage3-openrc.spec"
44 SET_hardened_openrc_OPTIONAL_SPECS="hardened/admincd-stage1.spec hardened/admincd-stage2.spec"
45 @@ -145,6 +146,9 @@ post_build() {
46 stage3-systemd-mu.spec)
47 upload stage3-amd64-systemd-mergedusr-${TIMESTAMP}.tar.xz*
48 ;;
49 + stage3d-systemd-mu.spec)
50 + upload stage3-amd64-desktop-systemd-mergedusr-${TIMESTAMP}.tar.xz*
51 + ;;
52 nomultilib/stage3-systemd-mu.spec)
53 upload stage3-amd64-nomultilib-systemd-mergedusr-${TIMESTAMP}.tar.xz*
54 ;;