Gentoo Archives: gentoo-releng

From: Matt Turner <mattst88@g.o>
To: gentoo-releng@l.g.o
Cc: Matt Turner <mattst88@g.o>
Subject: [gentoo-releng] [PATCH 2/2] x86: Add systemd specs
Date: Fri, 22 May 2020 01:54:01
Message-Id: 20200522015306.2988972-2-mattst88@gentoo.org
In Reply to: [gentoo-releng] [PATCH 1/2] amd64: Add systemd specs by Matt Turner
1 Signed-off-by: Matt Turner <mattst88@g.o>
2 ---
3 releases/specs/x86/i686/stage1-systemd.spec | 12 ++++++++++++
4 releases/specs/x86/i686/stage2-systemd.spec | 10 ++++++++++
5 releases/specs/x86/i686/stage3-systemd.spec | 10 ++++++++++
6 tools/catalyst-auto-x86.conf | 6 ++++++
7 4 files changed, 38 insertions(+)
8 create mode 100644 releases/specs/x86/i686/stage1-systemd.spec
9 create mode 100644 releases/specs/x86/i686/stage2-systemd.spec
10 create mode 100644 releases/specs/x86/i686/stage3-systemd.spec
11
12 diff --git a/releases/specs/x86/i686/stage1-systemd.spec b/releases/specs/x86/i686/stage1-systemd.spec
13 new file mode 100644
14 index 00000000..c1d4a09e
15 --- /dev/null
16 +++ b/releases/specs/x86/i686/stage1-systemd.spec
17 @@ -0,0 +1,12 @@
18 +subarch: i686
19 +target: stage1
20 +version_stamp: systemd-@TIMESTAMP@
21 +rel_type: default
22 +profile: default/linux/x86/17.0/systemd
23 +snapshot: @TIMESTAMP@
24 +source_subpath: default/stage3-i686-systemd-latest
25 +compression_mode: pixz_x
26 +update_seed: yes
27 +update_seed_command: --update --deep --newuse @world
28 +portage_confdir: @REPO_DIR@/releases/portage/stages
29 +portage_prefix: releng
30 diff --git a/releases/specs/x86/i686/stage2-systemd.spec b/releases/specs/x86/i686/stage2-systemd.spec
31 new file mode 100644
32 index 00000000..d7a99295
33 --- /dev/null
34 +++ b/releases/specs/x86/i686/stage2-systemd.spec
35 @@ -0,0 +1,10 @@
36 +subarch: i686
37 +target: stage2
38 +version_stamp: systemd-@TIMESTAMP@
39 +rel_type: default
40 +profile: default/linux/x86/17.0/systemd
41 +snapshot: @TIMESTAMP@
42 +source_subpath: default/stage1-i686-systemd-@TIMESTAMP@
43 +compression_mode: pixz_x
44 +portage_confdir: @REPO_DIR@/releases/portage/stages
45 +portage_prefix: releng
46 diff --git a/releases/specs/x86/i686/stage3-systemd.spec b/releases/specs/x86/i686/stage3-systemd.spec
47 new file mode 100644
48 index 00000000..1ac69305
49 --- /dev/null
50 +++ b/releases/specs/x86/i686/stage3-systemd.spec
51 @@ -0,0 +1,10 @@
52 +subarch: i686
53 +target: stage3
54 +version_stamp: systemd-@TIMESTAMP@
55 +rel_type: default
56 +profile: default/linux/x86/17.0/systemd
57 +snapshot: @TIMESTAMP@
58 +source_subpath: default/stage2-i686-systemd-@TIMESTAMP@
59 +compression_mode: pixz_x
60 +portage_confdir: @REPO_DIR@/releases/portage/stages
61 +portage_prefix: releng
62 diff --git a/tools/catalyst-auto-x86.conf b/tools/catalyst-auto-x86.conf
63 index e6307421..9dbab7be 100644
64 --- a/tools/catalyst-auto-x86.conf
65 +++ b/tools/catalyst-auto-x86.conf
66 @@ -12,6 +12,7 @@ SPECS_DIR=${REPO_DIR}/releases/specs/${ARCH}
67 SETS="
68 i486
69 i686
70 + i686-systemd
71 hardened
72 "
73
74 @@ -20,6 +21,8 @@ SET_i486_OPTIONAL_SPECS="installcd-stage1.spec installcd-stage2-minimal.spec"
75
76 SET_i686_SPECS="i686/stage1.spec i686/stage2.spec i686/stage3.spec"
77
78 +SET_i686_SPECS="i686/stage1-systemd.spec i686/stage2-systemd.spec i686/stage3-systemd.spec"
79 +
80 SET_hardened_SPECS="hardened/stage1.spec hardened/stage2.spec hardened/stage3.spec"
81 SET_hardened_OPTIONAL_SPECS="hardened/admincd-stage1.spec hardened/admincd-stage2.spec"
82
83 @@ -86,6 +89,9 @@ post_build() {
84 i686/stage3.spec)
85 upload stage3-i686-${TIMESTAMP}.tar.xz*
86 ;;
87 + i686/stage3-systemd.spec)
88 + upload stage3-i686-${TIMESTAMP}.tar.xz*
89 + ;;
90 esac
91 popd >/dev/null || exit
92
93 --
94 2.26.2