Gentoo Archives: gentoo-commits

From: Mike Gilbert <floppym@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: profiles/
Date: Sat, 03 Sep 2022 15:03:40
Message-Id: 1662217336.9ca5d5096e2d06100fcf267391ad3e4fa95902fc.floppym@gentoo
1 commit: 9ca5d5096e2d06100fcf267391ad3e4fa95902fc
2 Author: Mike Gilbert <floppym <AT> gentoo <DOT> org>
3 AuthorDate: Tue Aug 30 16:35:00 2022 +0000
4 Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
5 CommitDate: Sat Sep 3 15:02:16 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9ca5d509
7
8 profiles/profiles.desc: add systemd/merged-usr subprofiles
9
10 Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>
11
12 profiles/profiles.desc | 54 ++++++++++++++++++++++++++++++++++++++++++++++++++
13 1 file changed, 54 insertions(+)
14
15 diff --git a/profiles/profiles.desc b/profiles/profiles.desc
16 index 894b0377d33e..4bc94f910aba 100644
17 --- a/profiles/profiles.desc
18 +++ b/profiles/profiles.desc
19 @@ -13,9 +13,11 @@
20 # @MAINTAINER: alpha@g.o
21 alpha default/linux/alpha/17.0 exp
22 alpha default/linux/alpha/17.0/systemd exp
23 +alpha default/linux/alpha/17.0/systemd/merged-usr exp
24 alpha default/linux/alpha/17.0/desktop exp
25 alpha default/linux/alpha/17.0/desktop/gnome exp
26 alpha default/linux/alpha/17.0/desktop/gnome/systemd exp
27 +alpha default/linux/alpha/17.0/desktop/gnome/systemd/merged-usr exp
28 alpha default/linux/alpha/17.0/developer exp
29
30 # SYMLINK_LIB=no profiles
31 @@ -28,16 +30,21 @@ amd64 default/linux/amd64/17.1/hardened/selinux stable
32 amd64 default/linux/amd64/17.1/desktop stable
33 amd64 default/linux/amd64/17.1/desktop/gnome stable
34 amd64 default/linux/amd64/17.1/desktop/gnome/systemd stable
35 +amd64 default/linux/amd64/17.1/desktop/gnome/systemd/merged-usr dev
36 amd64 default/linux/amd64/17.1/desktop/plasma stable
37 amd64 default/linux/amd64/17.1/desktop/plasma/systemd stable
38 +amd64 default/linux/amd64/17.1/desktop/plasma/systemd/merged-usr dev
39 amd64 default/linux/amd64/17.1/desktop/systemd stable
40 +amd64 default/linux/amd64/17.1/desktop/systemd/merged-usr dev
41 amd64 default/linux/amd64/17.1/developer exp
42 amd64 default/linux/amd64/17.1/no-multilib stable
43 amd64 default/linux/amd64/17.1/no-multilib/hardened stable
44 amd64 default/linux/amd64/17.1/no-multilib/hardened/selinux stable
45 amd64 default/linux/amd64/17.1/no-multilib/systemd dev
46 +amd64 default/linux/amd64/17.1/no-multilib/systemd/merged-usr dev
47 amd64 default/linux/amd64/17.1/no-multilib/systemd/selinux exp
48 amd64 default/linux/amd64/17.1/systemd stable
49 +amd64 default/linux/amd64/17.1/systemd/merged-usr dev
50 amd64 default/linux/amd64/17.1/systemd/selinux exp
51 amd64 default/linux/amd64/17.1/clang exp
52 amd64 default/linux/amd64/17.1/systemd/clang exp
53 @@ -66,8 +73,10 @@ arm default/linux/arm/17.0 stable
54 arm default/linux/arm/17.0/desktop dev
55 arm default/linux/arm/17.0/desktop/gnome dev
56 arm default/linux/arm/17.0/desktop/gnome/systemd dev
57 +arm default/linux/arm/17.0/desktop/gnome/systemd/merged-usr dev
58 arm default/linux/arm/17.0/desktop/plasma dev
59 arm default/linux/arm/17.0/desktop/plasma/systemd dev
60 +arm default/linux/arm/17.0/desktop/plasma/systemd/merged-usr dev
61 arm default/linux/arm/17.0/developer exp
62 arm default/linux/arm/17.0/armv4 dev
63 arm default/linux/arm/17.0/armv4/desktop dev
64 @@ -80,12 +89,14 @@ arm default/linux/arm/17.0/armv4t/desktop/gnome dev
65 arm default/linux/arm/17.0/armv4t/desktop/plasma dev
66 arm default/linux/arm/17.0/armv4t/developer exp
67 arm default/linux/arm/17.0/armv4t/systemd dev
68 +arm default/linux/arm/17.0/armv4t/systemd/merged-usr dev
69 arm default/linux/arm/17.0/armv5te dev
70 arm default/linux/arm/17.0/armv5te/desktop dev
71 arm default/linux/arm/17.0/armv5te/desktop/gnome dev
72 arm default/linux/arm/17.0/armv5te/desktop/plasma dev
73 arm default/linux/arm/17.0/armv5te/developer exp
74 arm default/linux/arm/17.0/armv5te/systemd dev
75 +arm default/linux/arm/17.0/armv5te/systemd/merged-usr dev
76 arm default/linux/arm/17.0/armv6j stable
77 arm default/linux/arm/17.0/armv6j/hardened exp
78 arm default/linux/arm/17.0/armv7a/hardened/selinux exp
79 @@ -95,16 +106,21 @@ arm default/linux/arm/17.0/armv6j/desktop/plasma dev
80 arm default/linux/arm/17.0/armv6j/developer exp
81 arm default/linux/arm/17.0/armv6j/selinux exp
82 arm default/linux/arm/17.0/armv6j/systemd dev
83 +arm default/linux/arm/17.0/armv6j/systemd/merged-usr dev
84 arm default/linux/arm/17.0/armv7a stable
85 arm default/linux/arm/17.0/armv7a/hardened exp
86 arm default/linux/arm/17.0/armv7a/hardened/selinux dev
87 arm default/linux/arm/17.0/armv7a/desktop dev
88 arm default/linux/arm/17.0/armv7a/desktop/gnome dev
89 arm default/linux/arm/17.0/armv7a/desktop/gnome/systemd dev
90 +arm default/linux/arm/17.0/armv7a/desktop/gnome/systemd/merged-usr dev
91 arm default/linux/arm/17.0/armv7a/desktop/plasma dev
92 arm default/linux/arm/17.0/armv7a/desktop/plasma/systemd dev
93 +arm default/linux/arm/17.0/armv7a/desktop/plasma/systemd/merged-usr dev
94 arm default/linux/arm/17.0/armv7a/developer exp
95 arm default/linux/arm/17.0/armv7a/systemd dev
96 +arm default/linux/arm/17.0/armv7a/systemd/merged-usr dev
97 +
98
99 # ARM64 Profiles
100 # @MAINTAINER: arm64@g.o
101 @@ -114,13 +130,18 @@ arm64 default/linux/arm64/17.0/hardened/selinux dev
102 arm64 default/linux/arm64/17.0/desktop stable
103 arm64 default/linux/arm64/17.0/desktop/gnome stable
104 arm64 default/linux/arm64/17.0/desktop/gnome/systemd stable
105 +arm64 default/linux/arm64/17.0/desktop/gnome/systemd/merged-usr dev
106 arm64 default/linux/arm64/17.0/desktop/plasma stable
107 arm64 default/linux/arm64/17.0/desktop/plasma/systemd stable
108 +arm64 default/linux/arm64/17.0/desktop/plasma/systemd/merged-usr dev
109 arm64 default/linux/arm64/17.0/desktop/systemd stable
110 +arm64 default/linux/arm64/17.0/desktop/systemd/merged-usr dev
111 arm64 default/linux/arm64/17.0/developer exp
112 arm64 default/linux/arm64/17.0/systemd stable
113 +arm64 default/linux/arm64/17.0/systemd/merged-usr dev
114 arm64 default/linux/arm64/17.0/systemd/selinux exp
115
116 +
117 # ARM64 Profiles (big-endian)
118 # @MAINTAINER: steev@g.o, slyfox@g.o
119 # big-endian profile intentionally does not contain all flavours
120 @@ -131,6 +152,7 @@ arm64 default/linux/arm64/17.0/big-endian exp
121 # @MAINTAINER: hppa@g.o
122 hppa default/linux/hppa/17.0 stable
123 hppa default/linux/hppa/17.0/systemd exp
124 +hppa default/linux/hppa/17.0/systemd/merged-usr dev
125 hppa default/linux/hppa/17.0/desktop stable
126 hppa default/linux/hppa/17.0/developer exp
127
128 @@ -140,20 +162,26 @@ ia64 default/linux/ia64/17.0 stable
129 ia64 default/linux/ia64/17.0/desktop stable
130 ia64 default/linux/ia64/17.0/desktop/gnome stable
131 ia64 default/linux/ia64/17.0/desktop/gnome/systemd stable
132 +ia64 default/linux/ia64/17.0/desktop/gnome/systemd/merged-usr dev
133 ia64 default/linux/ia64/17.0/developer exp
134 ia64 default/linux/ia64/17.0/systemd exp
135 +ia64 default/linux/ia64/17.0/systemd/merged-usr exp
136 +
137
138 # LoongArch Profiles
139 # @MAINTAINER: loong@g.o
140 loong default/linux/loong/22.0/la64v100/lp64d exp
141 loong default/linux/loong/22.0/la64v100/lp64d/desktop exp
142 loong default/linux/loong/22.0/la64v100/lp64d/desktop/systemd exp
143 +loong default/linux/loong/22.0/la64v100/lp64d/desktop/systemd/merged-usr exp
144 loong default/linux/loong/22.0/la64v100/lp64d/systemd exp
145 +loong default/linux/loong/22.0/la64v100/lp64d/systemd/merged-usr exp
146
147 # M68K Profiles
148 # @MAINTAINER: m68k@g.o
149 m68k default/linux/m68k/17.0 exp
150 m68k default/linux/m68k/17.0/systemd exp
151 +m68k default/linux/m68k/17.0/systemd/merged-usr exp
152
153 # MIPS Profiles
154 # @MAINTAINER: mips@g.o
155 @@ -167,10 +195,13 @@ mips default/linux/mips/17.0/mipsel/o32 exp
156 mips default/linux/mips/17.0/mipsel/n32 exp
157 mips default/linux/mips/17.0/mipsel/n64 exp
158 mips default/linux/mips/17.0/mipsel/n64/systemd exp
159 +mips default/linux/mips/17.0/mipsel/n64/systemd/merged-usr exp
160 mips default/linux/mips/17.0/mipsel/multilib/o32 exp
161 mips default/linux/mips/17.0/mipsel/multilib/n32 exp
162 mips default/linux/mips/17.0/mipsel/multilib/n64 exp
163 mips default/linux/mips/17.0/mipsel/multilib/n64/systemd exp
164 +mips default/linux/mips/17.0/mipsel/multilib/n64/systemd/merged-usr exp
165 +
166
167 # Deprecated PPC32 Profiles
168 # @MAINTAINER: ppc@g.o
169 @@ -199,7 +230,9 @@ ppc default/linux/ppc/17.0 stable
170 ppc default/linux/ppc/17.0/desktop stable
171 ppc default/linux/ppc/17.0/desktop/gnome stable
172 ppc default/linux/ppc/17.0/desktop/gnome/systemd stable
173 +ppc default/linux/ppc/17.0/desktop/gnome/systemd/merged-usr dev
174 ppc default/linux/ppc/17.0/systemd stable
175 +ppc default/linux/ppc/17.0/systemd/merged-usr dev
176 ppc default/linux/ppc/17.0/developer exp
177 ppc default/linux/ppc/17.0/musl exp
178 ppc default/linux/ppc/17.0/musl/hardened exp
179 @@ -210,7 +243,9 @@ ppc64 default/linux/ppc64/17.0 stable
180 ppc64 default/linux/ppc64/17.0/desktop stable
181 ppc64 default/linux/ppc64/17.0/desktop/gnome stable
182 ppc64 default/linux/ppc64/17.0/desktop/gnome/systemd stable
183 +ppc64 default/linux/ppc64/17.0/desktop/gnome/systemd/merged-usr dev
184 ppc64 default/linux/ppc64/17.0/systemd stable
185 +ppc64 default/linux/ppc64/17.0/systemd/merged-usr dev
186 ppc64 default/linux/ppc64/17.0/developer exp
187 ppc64 default/linux/ppc64/17.0/musl exp
188 ppc64 default/linux/ppc64/17.0/musl/hardened exp
189 @@ -221,9 +256,12 @@ ppc64 default/linux/ppc64le/17.0 stable
190 ppc64 default/linux/ppc64le/17.0/desktop stable
191 ppc64 default/linux/ppc64le/17.0/desktop/gnome stable
192 ppc64 default/linux/ppc64le/17.0/desktop/gnome/systemd stable
193 +ppc64 default/linux/ppc64le/17.0/desktop/gnome/systemd/merged-usr dev
194 ppc64 default/linux/ppc64le/17.0/desktop/plasma stable
195 ppc64 default/linux/ppc64le/17.0/desktop/plasma/systemd stable
196 +ppc64 default/linux/ppc64le/17.0/desktop/plasma/systemd/merged-usr dev
197 ppc64 default/linux/ppc64le/17.0/systemd stable
198 +ppc64 default/linux/ppc64le/17.0/systemd/merged-usr dev
199 ppc64 default/linux/ppc64le/17.0/developer exp
200 ppc64 default/linux/ppc64le/17.0/musl exp
201 ppc64 default/linux/ppc64le/17.0/musl/hardened exp
202 @@ -234,27 +272,38 @@ riscv default/linux/riscv/20.0/rv64gc/lp64d stable
203 riscv default/linux/riscv/20.0/rv64gc/lp64d/desktop dev
204 riscv default/linux/riscv/20.0/rv64gc/lp64d/desktop/gnome dev
205 riscv default/linux/riscv/20.0/rv64gc/lp64d/desktop/gnome/systemd dev
206 +riscv default/linux/riscv/20.0/rv64gc/lp64d/desktop/gnome/systemd/merged-usr dev
207 riscv default/linux/riscv/20.0/rv64gc/lp64d/desktop/plasma dev
208 riscv default/linux/riscv/20.0/rv64gc/lp64d/desktop/plasma/systemd dev
209 +riscv default/linux/riscv/20.0/rv64gc/lp64d/desktop/plasma/systemd/merged-usr dev
210 riscv default/linux/riscv/20.0/rv64gc/lp64d/desktop/systemd dev
211 +riscv default/linux/riscv/20.0/rv64gc/lp64d/desktop/systemd/merged-usr dev
212 riscv default/linux/riscv/20.0/rv64gc/lp64d/systemd stable
213 +riscv default/linux/riscv/20.0/rv64gc/lp64d/systemd/merged-usr dev
214 riscv default/linux/riscv/20.0/rv64gc/lp64 stable
215 riscv default/linux/riscv/20.0/rv64gc/lp64/desktop dev
216 riscv default/linux/riscv/20.0/rv64gc/lp64/desktop/gnome dev
217 riscv default/linux/riscv/20.0/rv64gc/lp64/desktop/gnome/systemd dev
218 +riscv default/linux/riscv/20.0/rv64gc/lp64/desktop/gnome/systemd/merged-usr dev
219 riscv default/linux/riscv/20.0/rv64gc/lp64/desktop/plasma dev
220 riscv default/linux/riscv/20.0/rv64gc/lp64/desktop/plasma/systemd dev
221 +riscv default/linux/riscv/20.0/rv64gc/lp64/desktop/plasma/systemd/merged-usr dev
222 riscv default/linux/riscv/20.0/rv64gc/lp64/desktop/systemd dev
223 +riscv default/linux/riscv/20.0/rv64gc/lp64/desktop/systemd/merged-usr dev
224 riscv default/linux/riscv/20.0/rv64gc/lp64/systemd stable
225 +riscv default/linux/riscv/20.0/rv64gc/lp64/systemd/merged-usr dev
226 riscv default/linux/riscv/20.0/rv64gc/multilib exp
227 riscv default/linux/riscv/20.0/rv64gc/multilib/systemd exp
228 +riscv default/linux/riscv/20.0/rv64gc/multilib/systemd/merged-usr exp
229
230 # S390 Profiles
231 # @MAINTAINER: s390@g.o
232 s390 default/linux/s390/17.0 stable
233 s390 default/linux/s390/17.0/s390x stable
234 s390 default/linux/s390/17.0/systemd stable
235 +s390 default/linux/s390/17.0/systemd/merged-usr dev
236 s390 default/linux/s390/17.0/s390x/systemd exp
237 +s390 default/linux/s390/17.0/s390x/systemd/merged-usr dev
238
239 # SPARC Profiles
240 # @MAINTAINER: sparc@g.o
241 @@ -262,10 +311,12 @@ sparc default/linux/sparc/17.0 stable
242 sparc default/linux/sparc/17.0/desktop stable
243 sparc default/linux/sparc/17.0/developer exp
244 sparc default/linux/sparc/17.0/systemd stable
245 +sparc default/linux/sparc/17.0/systemd/merged-usr dev
246 sparc default/linux/sparc/17.0/64ul stable
247 sparc default/linux/sparc/17.0/64ul/desktop stable
248 sparc default/linux/sparc/17.0/64ul/developer exp
249 sparc default/linux/sparc/17.0/64ul/systemd stable
250 +sparc default/linux/sparc/17.0/64ul/systemd/merged-usr dev
251
252 # x86 Profiles
253 # @MAINTAINER: x86@g.o
254 @@ -276,10 +327,13 @@ x86 default/linux/x86/17.0/hardened/selinux stable
255 x86 default/linux/x86/17.0/desktop stable
256 x86 default/linux/x86/17.0/desktop/gnome stable
257 x86 default/linux/x86/17.0/desktop/gnome/systemd stable
258 +x86 default/linux/x86/17.0/desktop/gnome/systemd/merged-usr dev
259 x86 default/linux/x86/17.0/desktop/plasma stable
260 x86 default/linux/x86/17.0/desktop/plasma/systemd stable
261 +x86 default/linux/x86/17.0/desktop/plasma/systemd/merged-usr dev
262 x86 default/linux/x86/17.0/developer exp
263 x86 default/linux/x86/17.0/systemd stable
264 +x86 default/linux/x86/17.0/systemd/merged-usr dev
265
266 # musl profiles
267 # @MAINTAINER: musl@g.o