Gentoo Archives: gentoo-commits

From: Matt Turner <mattst88@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/releng:master commit in: releases/specs/amd64/, tools/
Date: Sat, 23 May 2020 18:17:04
Message-Id: 1590112011.a24359b95ce5c2e9316f87142bdcc7551166ce5b.mattst88@gentoo
1 commit: a24359b95ce5c2e9316f87142bdcc7551166ce5b
2 Author: Matt Turner <mattst88 <AT> gentoo <DOT> org>
3 AuthorDate: Fri May 22 01:46:51 2020 +0000
4 Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
5 CommitDate: Fri May 22 01:46:51 2020 +0000
6 URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=a24359b9
7
8 amd64: Add systemd specs
9
10 Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>
11
12 releases/specs/amd64/stage1-systemd.spec | 12 ++++++++++++
13 releases/specs/amd64/stage2-systemd.spec | 10 ++++++++++
14 releases/specs/amd64/stage3-systemd.spec | 10 ++++++++++
15 tools/catalyst-auto-amd64.conf | 6 ++++++
16 4 files changed, 38 insertions(+)
17
18 diff --git a/releases/specs/amd64/stage1-systemd.spec b/releases/specs/amd64/stage1-systemd.spec
19 new file mode 100644
20 index 00000000..d6375069
21 --- /dev/null
22 +++ b/releases/specs/amd64/stage1-systemd.spec
23 @@ -0,0 +1,12 @@
24 +subarch: amd64
25 +target: stage1
26 +version_stamp: systemd-@TIMESTAMP@
27 +rel_type: default
28 +profile: default/linux/amd64/17.1/systemd
29 +snapshot: @TIMESTAMP@
30 +source_subpath: default/stage3-amd64-systemd-latest
31 +compression_mode: pixz_x
32 +update_seed: yes
33 +update_seed_command: --update --deep --newuse @world
34 +portage_confdir: @REPO_DIR@/releases/portage/stages
35 +portage_prefix: releng
36
37 diff --git a/releases/specs/amd64/stage2-systemd.spec b/releases/specs/amd64/stage2-systemd.spec
38 new file mode 100644
39 index 00000000..2c5ea742
40 --- /dev/null
41 +++ b/releases/specs/amd64/stage2-systemd.spec
42 @@ -0,0 +1,10 @@
43 +subarch: amd64
44 +target: stage2
45 +version_stamp: systemd-@TIMESTAMP@
46 +rel_type: default
47 +profile: default/linux/amd64/17.1/systemd
48 +snapshot: @TIMESTAMP@
49 +source_subpath: default/stage1-amd64-systemd-@TIMESTAMP@
50 +compression_mode: pixz_x
51 +portage_confdir: @REPO_DIR@/releases/portage/stages
52 +portage_prefix: releng
53
54 diff --git a/releases/specs/amd64/stage3-systemd.spec b/releases/specs/amd64/stage3-systemd.spec
55 new file mode 100644
56 index 00000000..0b44ad5b
57 --- /dev/null
58 +++ b/releases/specs/amd64/stage3-systemd.spec
59 @@ -0,0 +1,10 @@
60 +subarch: amd64
61 +target: stage3
62 +version_stamp: systemd-@TIMESTAMP@
63 +rel_type: default
64 +profile: default/linux/amd64/17.1/systemd
65 +snapshot: @TIMESTAMP@
66 +source_subpath: default/stage2-amd64-systemd-@TIMESTAMP@
67 +compression_mode: pixz_x
68 +portage_confdir: @REPO_DIR@/releases/portage/stages
69 +portage_prefix: releng
70
71 diff --git a/tools/catalyst-auto-amd64.conf b/tools/catalyst-auto-amd64.conf
72 index 586b9083..bbf27ca2 100644
73 --- a/tools/catalyst-auto-amd64.conf
74 +++ b/tools/catalyst-auto-amd64.conf
75 @@ -13,6 +13,7 @@ SETS="
76 multilib minimal_multilib
77 nomultilib minimal_nomultilib
78 x32
79 + systemd
80 hardened_multilib minimal_hardened_multilib
81 hardened_nomultilib minimal_hardened_nomultilib
82 "
83 @@ -25,6 +26,8 @@ SET_minimal_multilib_OPTIONAL_SPECS="stage4-minimal.spec"
84 SET_nomultilib_SPECS="stage1-nomultilib.spec stage2-nomultilib.spec stage3-nomultilib.spec"
85 SET_minimal_nomultilib_OPTIONAL_SPECS="stage4-nomultilib-minimal.spec"
86
87 +SET_systemd_SPECS="stage1-systemd.spec stage2-systemd.spec stage3-systemd.spec"
88 +
89 SET_x32_SPECS="stage1-x32.spec stage2-x32.spec stage3-x32.spec"
90
91 SET_hardened_multilib_SPECS="hardened/stage1.spec hardened/stage2.spec hardened/stage3.spec"
92 @@ -106,6 +109,9 @@ post_build() {
93 stage4-nomultilib-minimal.spec)
94 upload stage4-amd64-minimal-nomultilib-${TIMESTAMP}.tar.xz*
95 ;;
96 + stage3-systemd.spec)
97 + upload stage3-systemd-${TIMESTAMP}.tar.xz*
98 + ;;
99 stage3-x32.spec)
100 upload stage3-x32-${TIMESTAMP}.tar.xz*
101 ;;