Gentoo Archives: gentoo-dev

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