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/default/linux/riscv/20.0/rv64gc/lp64d/desktop/gnome/systemd/merged-usr/, ...
Date: Sat, 03 Sep 2022 15:03:39
Message-Id: 1662217335.73cf1311a445097d6559cf5d3b843470837d0a57.floppym@gentoo
1 commit: 73cf1311a445097d6559cf5d3b843470837d0a57
2 Author: Mike Gilbert <floppym <AT> gentoo <DOT> org>
3 AuthorDate: Tue Aug 30 16:34:25 2022 +0000
4 Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
5 CommitDate: Sat Sep 3 15:02:15 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=73cf1311
7
8 profiles/default/linux: add systemd/merged-usr subprofiles
9
10 Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>
11
12 profiles/default/linux/alpha/17.0/desktop/gnome/systemd/merged-usr/eapi | 1 +
13 .../default/linux/alpha/17.0/desktop/gnome/systemd/merged-usr/parent | 2 ++
14 profiles/default/linux/alpha/17.0/systemd/merged-usr/eapi | 1 +
15 profiles/default/linux/alpha/17.0/systemd/merged-usr/parent | 2 ++
16 profiles/default/linux/amd64/17.1/desktop/gnome/systemd/merged-usr/eapi | 1 +
17 .../default/linux/amd64/17.1/desktop/gnome/systemd/merged-usr/parent | 2 ++
18 .../default/linux/amd64/17.1/desktop/plasma/systemd/merged-usr/eapi | 1 +
19 .../default/linux/amd64/17.1/desktop/plasma/systemd/merged-usr/parent | 2 ++
20 profiles/default/linux/amd64/17.1/desktop/systemd/merged-usr/eapi | 1 +
21 profiles/default/linux/amd64/17.1/desktop/systemd/merged-usr/parent | 2 ++
22 profiles/default/linux/amd64/17.1/no-multilib/systemd/merged-usr/eapi | 1 +
23 profiles/default/linux/amd64/17.1/no-multilib/systemd/merged-usr/parent | 2 ++
24 profiles/default/linux/amd64/17.1/systemd/merged-usr/eapi | 1 +
25 profiles/default/linux/amd64/17.1/systemd/merged-usr/parent | 2 ++
26 profiles/default/linux/arm/17.0/armv4t/systemd/merged-usr/eapi | 1 +
27 profiles/default/linux/arm/17.0/armv4t/systemd/merged-usr/parent | 2 ++
28 profiles/default/linux/arm/17.0/armv5te/systemd/merged-usr/eapi | 1 +
29 profiles/default/linux/arm/17.0/armv5te/systemd/merged-usr/parent | 2 ++
30 profiles/default/linux/arm/17.0/armv6j/systemd/merged-usr/eapi | 1 +
31 profiles/default/linux/arm/17.0/armv6j/systemd/merged-usr/parent | 2 ++
32 .../default/linux/arm/17.0/armv7a/desktop/gnome/systemd/merged-usr/eapi | 1 +
33 .../linux/arm/17.0/armv7a/desktop/gnome/systemd/merged-usr/parent | 2 ++
34 .../linux/arm/17.0/armv7a/desktop/plasma/systemd/merged-usr/eapi | 1 +
35 .../linux/arm/17.0/armv7a/desktop/plasma/systemd/merged-usr/parent | 2 ++
36 profiles/default/linux/arm/17.0/armv7a/systemd/merged-usr/eapi | 1 +
37 profiles/default/linux/arm/17.0/armv7a/systemd/merged-usr/parent | 2 ++
38 profiles/default/linux/arm/17.0/desktop/gnome/systemd/merged-usr/eapi | 1 +
39 profiles/default/linux/arm/17.0/desktop/gnome/systemd/merged-usr/parent | 2 ++
40 profiles/default/linux/arm/17.0/desktop/plasma/systemd/merged-usr/eapi | 1 +
41 .../default/linux/arm/17.0/desktop/plasma/systemd/merged-usr/parent | 2 ++
42 profiles/default/linux/arm64/17.0/desktop/gnome/systemd/merged-usr/eapi | 1 +
43 .../default/linux/arm64/17.0/desktop/gnome/systemd/merged-usr/parent | 2 ++
44 .../default/linux/arm64/17.0/desktop/plasma/systemd/merged-usr/eapi | 1 +
45 .../default/linux/arm64/17.0/desktop/plasma/systemd/merged-usr/parent | 2 ++
46 profiles/default/linux/arm64/17.0/desktop/systemd/merged-usr/eapi | 1 +
47 profiles/default/linux/arm64/17.0/desktop/systemd/merged-usr/parent | 2 ++
48 profiles/default/linux/arm64/17.0/systemd/merged-usr/eapi | 1 +
49 profiles/default/linux/arm64/17.0/systemd/merged-usr/parent | 2 ++
50 profiles/default/linux/hppa/17.0/systemd/merged-usr/eapi | 1 +
51 profiles/default/linux/hppa/17.0/systemd/merged-usr/parent | 2 ++
52 profiles/default/linux/ia64/17.0/desktop/gnome/systemd/merged-usr/eapi | 1 +
53 .../default/linux/ia64/17.0/desktop/gnome/systemd/merged-usr/parent | 2 ++
54 profiles/default/linux/ia64/17.0/systemd/merged-usr/eapi | 1 +
55 profiles/default/linux/ia64/17.0/systemd/merged-usr/parent | 2 ++
56 .../linux/loong/22.0/la64v100/lp64d/desktop/systemd/merged-usr/eapi | 1 +
57 .../linux/loong/22.0/la64v100/lp64d/desktop/systemd/merged-usr/parent | 2 ++
58 .../default/linux/loong/22.0/la64v100/lp64d/systemd/merged-usr/eapi | 1 +
59 .../default/linux/loong/22.0/la64v100/lp64d/systemd/merged-usr/parent | 2 ++
60 profiles/default/linux/m68k/17.0/systemd/merged-usr/eapi | 1 +
61 profiles/default/linux/m68k/17.0/systemd/merged-usr/parent | 2 ++
62 .../default/linux/mips/17.0/mipsel/multilib/n64/systemd/merged-usr/eapi | 1 +
63 .../linux/mips/17.0/mipsel/multilib/n64/systemd/merged-usr/parent | 2 ++
64 profiles/default/linux/mips/17.0/mipsel/n64/systemd/merged-usr/eapi | 1 +
65 profiles/default/linux/mips/17.0/mipsel/n64/systemd/merged-usr/parent | 2 ++
66 .../linux/powerpc/ppc32/17.0/desktop/gnome/systemd/merged-usr/eapi | 1 +
67 .../linux/powerpc/ppc32/17.0/desktop/gnome/systemd/merged-usr/parent | 2 ++
68 .../ppc64/17.0/32bit-userland/desktop/gnome/systemd/merged-usr/eapi | 1 +
69 .../ppc64/17.0/32bit-userland/desktop/gnome/systemd/merged-usr/parent | 2 ++
70 .../ppc64/17.0/64bit-userland/desktop/gnome/systemd/merged-usr/eapi | 1 +
71 .../ppc64/17.0/64bit-userland/desktop/gnome/systemd/merged-usr/parent | 2 ++
72 profiles/default/linux/ppc/17.0/desktop/gnome/systemd/merged-usr/eapi | 1 +
73 profiles/default/linux/ppc/17.0/desktop/gnome/systemd/merged-usr/parent | 2 ++
74 profiles/default/linux/ppc/17.0/systemd/merged-usr/eapi | 1 +
75 profiles/default/linux/ppc/17.0/systemd/merged-usr/parent | 2 ++
76 profiles/default/linux/ppc64/17.0/desktop/gnome/systemd/merged-usr/eapi | 1 +
77 .../default/linux/ppc64/17.0/desktop/gnome/systemd/merged-usr/parent | 2 ++
78 profiles/default/linux/ppc64/17.0/systemd/merged-usr/eapi | 1 +
79 profiles/default/linux/ppc64/17.0/systemd/merged-usr/parent | 2 ++
80 .../default/linux/ppc64le/17.0/desktop/gnome/systemd/merged-usr/eapi | 1 +
81 .../default/linux/ppc64le/17.0/desktop/gnome/systemd/merged-usr/parent | 2 ++
82 .../default/linux/ppc64le/17.0/desktop/plasma/systemd/merged-usr/eapi | 1 +
83 .../default/linux/ppc64le/17.0/desktop/plasma/systemd/merged-usr/parent | 2 ++
84 profiles/default/linux/ppc64le/17.0/systemd/merged-usr/eapi | 1 +
85 profiles/default/linux/ppc64le/17.0/systemd/merged-usr/parent | 2 ++
86 .../linux/riscv/20.0/rv64gc/lp64/desktop/gnome/systemd/merged-usr/eapi | 1 +
87 .../riscv/20.0/rv64gc/lp64/desktop/gnome/systemd/merged-usr/parent | 2 ++
88 .../linux/riscv/20.0/rv64gc/lp64/desktop/plasma/systemd/merged-usr/eapi | 1 +
89 .../riscv/20.0/rv64gc/lp64/desktop/plasma/systemd/merged-usr/parent | 2 ++
90 .../linux/riscv/20.0/rv64gc/lp64/desktop/systemd/merged-usr/eapi | 1 +
91 .../linux/riscv/20.0/rv64gc/lp64/desktop/systemd/merged-usr/parent | 2 ++
92 profiles/default/linux/riscv/20.0/rv64gc/lp64/systemd/merged-usr/eapi | 1 +
93 profiles/default/linux/riscv/20.0/rv64gc/lp64/systemd/merged-usr/parent | 2 ++
94 .../linux/riscv/20.0/rv64gc/lp64d/desktop/gnome/systemd/merged-usr/eapi | 1 +
95 .../riscv/20.0/rv64gc/lp64d/desktop/gnome/systemd/merged-usr/parent | 2 ++
96 .../riscv/20.0/rv64gc/lp64d/desktop/plasma/systemd/merged-usr/eapi | 1 +
97 .../riscv/20.0/rv64gc/lp64d/desktop/plasma/systemd/merged-usr/parent | 2 ++
98 .../linux/riscv/20.0/rv64gc/lp64d/desktop/systemd/merged-usr/eapi | 1 +
99 .../linux/riscv/20.0/rv64gc/lp64d/desktop/systemd/merged-usr/parent | 2 ++
100 profiles/default/linux/riscv/20.0/rv64gc/lp64d/systemd/merged-usr/eapi | 1 +
101 .../default/linux/riscv/20.0/rv64gc/lp64d/systemd/merged-usr/parent | 2 ++
102 .../default/linux/riscv/20.0/rv64gc/multilib/systemd/merged-usr/eapi | 1 +
103 .../default/linux/riscv/20.0/rv64gc/multilib/systemd/merged-usr/parent | 2 ++
104 profiles/default/linux/s390/17.0/s390x/systemd/merged-usr/eapi | 1 +
105 profiles/default/linux/s390/17.0/s390x/systemd/merged-usr/parent | 2 ++
106 profiles/default/linux/s390/17.0/systemd/merged-usr/eapi | 1 +
107 profiles/default/linux/s390/17.0/systemd/merged-usr/parent | 2 ++
108 profiles/default/linux/sparc/17.0/64ul/systemd/merged-usr/eapi | 1 +
109 profiles/default/linux/sparc/17.0/64ul/systemd/merged-usr/parent | 2 ++
110 profiles/default/linux/sparc/17.0/systemd/merged-usr/eapi | 1 +
111 profiles/default/linux/sparc/17.0/systemd/merged-usr/parent | 2 ++
112 profiles/default/linux/x86/17.0/desktop/gnome/systemd/merged-usr/eapi | 1 +
113 profiles/default/linux/x86/17.0/desktop/gnome/systemd/merged-usr/parent | 2 ++
114 profiles/default/linux/x86/17.0/desktop/plasma/systemd/merged-usr/eapi | 1 +
115 .../default/linux/x86/17.0/desktop/plasma/systemd/merged-usr/parent | 2 ++
116 profiles/default/linux/x86/17.0/systemd/merged-usr/eapi | 1 +
117 profiles/default/linux/x86/17.0/systemd/merged-usr/parent | 2 ++
118 106 files changed, 159 insertions(+)
119
120 diff --git a/profiles/default/linux/alpha/17.0/desktop/gnome/systemd/merged-usr/eapi b/profiles/default/linux/alpha/17.0/desktop/gnome/systemd/merged-usr/eapi
121 new file mode 100644
122 index 000000000000..7ed6ff82de6b
123 --- /dev/null
124 +++ b/profiles/default/linux/alpha/17.0/desktop/gnome/systemd/merged-usr/eapi
125 @@ -0,0 +1 @@
126 +5
127
128 diff --git a/profiles/default/linux/alpha/17.0/desktop/gnome/systemd/merged-usr/parent b/profiles/default/linux/alpha/17.0/desktop/gnome/systemd/merged-usr/parent
129 new file mode 100644
130 index 000000000000..1b7f7eef0a7e
131 --- /dev/null
132 +++ b/profiles/default/linux/alpha/17.0/desktop/gnome/systemd/merged-usr/parent
133 @@ -0,0 +1,2 @@
134 +..
135 +../../../../../../../../features/merged-usr
136
137 diff --git a/profiles/default/linux/alpha/17.0/systemd/merged-usr/eapi b/profiles/default/linux/alpha/17.0/systemd/merged-usr/eapi
138 new file mode 100644
139 index 000000000000..7ed6ff82de6b
140 --- /dev/null
141 +++ b/profiles/default/linux/alpha/17.0/systemd/merged-usr/eapi
142 @@ -0,0 +1 @@
143 +5
144
145 diff --git a/profiles/default/linux/alpha/17.0/systemd/merged-usr/parent b/profiles/default/linux/alpha/17.0/systemd/merged-usr/parent
146 new file mode 100644
147 index 000000000000..c407ca65bdc2
148 --- /dev/null
149 +++ b/profiles/default/linux/alpha/17.0/systemd/merged-usr/parent
150 @@ -0,0 +1,2 @@
151 +..
152 +../../../../../../features/merged-usr
153
154 diff --git a/profiles/default/linux/amd64/17.1/desktop/gnome/systemd/merged-usr/eapi b/profiles/default/linux/amd64/17.1/desktop/gnome/systemd/merged-usr/eapi
155 new file mode 100644
156 index 000000000000..7ed6ff82de6b
157 --- /dev/null
158 +++ b/profiles/default/linux/amd64/17.1/desktop/gnome/systemd/merged-usr/eapi
159 @@ -0,0 +1 @@
160 +5
161
162 diff --git a/profiles/default/linux/amd64/17.1/desktop/gnome/systemd/merged-usr/parent b/profiles/default/linux/amd64/17.1/desktop/gnome/systemd/merged-usr/parent
163 new file mode 100644
164 index 000000000000..1b7f7eef0a7e
165 --- /dev/null
166 +++ b/profiles/default/linux/amd64/17.1/desktop/gnome/systemd/merged-usr/parent
167 @@ -0,0 +1,2 @@
168 +..
169 +../../../../../../../../features/merged-usr
170
171 diff --git a/profiles/default/linux/amd64/17.1/desktop/plasma/systemd/merged-usr/eapi b/profiles/default/linux/amd64/17.1/desktop/plasma/systemd/merged-usr/eapi
172 new file mode 100644
173 index 000000000000..7ed6ff82de6b
174 --- /dev/null
175 +++ b/profiles/default/linux/amd64/17.1/desktop/plasma/systemd/merged-usr/eapi
176 @@ -0,0 +1 @@
177 +5
178
179 diff --git a/profiles/default/linux/amd64/17.1/desktop/plasma/systemd/merged-usr/parent b/profiles/default/linux/amd64/17.1/desktop/plasma/systemd/merged-usr/parent
180 new file mode 100644
181 index 000000000000..1b7f7eef0a7e
182 --- /dev/null
183 +++ b/profiles/default/linux/amd64/17.1/desktop/plasma/systemd/merged-usr/parent
184 @@ -0,0 +1,2 @@
185 +..
186 +../../../../../../../../features/merged-usr
187
188 diff --git a/profiles/default/linux/amd64/17.1/desktop/systemd/merged-usr/eapi b/profiles/default/linux/amd64/17.1/desktop/systemd/merged-usr/eapi
189 new file mode 100644
190 index 000000000000..7ed6ff82de6b
191 --- /dev/null
192 +++ b/profiles/default/linux/amd64/17.1/desktop/systemd/merged-usr/eapi
193 @@ -0,0 +1 @@
194 +5
195
196 diff --git a/profiles/default/linux/amd64/17.1/desktop/systemd/merged-usr/parent b/profiles/default/linux/amd64/17.1/desktop/systemd/merged-usr/parent
197 new file mode 100644
198 index 000000000000..c8b1675247c9
199 --- /dev/null
200 +++ b/profiles/default/linux/amd64/17.1/desktop/systemd/merged-usr/parent
201 @@ -0,0 +1,2 @@
202 +..
203 +../../../../../../../features/merged-usr
204
205 diff --git a/profiles/default/linux/amd64/17.1/no-multilib/systemd/merged-usr/eapi b/profiles/default/linux/amd64/17.1/no-multilib/systemd/merged-usr/eapi
206 new file mode 100644
207 index 000000000000..7ed6ff82de6b
208 --- /dev/null
209 +++ b/profiles/default/linux/amd64/17.1/no-multilib/systemd/merged-usr/eapi
210 @@ -0,0 +1 @@
211 +5
212
213 diff --git a/profiles/default/linux/amd64/17.1/no-multilib/systemd/merged-usr/parent b/profiles/default/linux/amd64/17.1/no-multilib/systemd/merged-usr/parent
214 new file mode 100644
215 index 000000000000..c8b1675247c9
216 --- /dev/null
217 +++ b/profiles/default/linux/amd64/17.1/no-multilib/systemd/merged-usr/parent
218 @@ -0,0 +1,2 @@
219 +..
220 +../../../../../../../features/merged-usr
221
222 diff --git a/profiles/default/linux/amd64/17.1/systemd/merged-usr/eapi b/profiles/default/linux/amd64/17.1/systemd/merged-usr/eapi
223 new file mode 100644
224 index 000000000000..7ed6ff82de6b
225 --- /dev/null
226 +++ b/profiles/default/linux/amd64/17.1/systemd/merged-usr/eapi
227 @@ -0,0 +1 @@
228 +5
229
230 diff --git a/profiles/default/linux/amd64/17.1/systemd/merged-usr/parent b/profiles/default/linux/amd64/17.1/systemd/merged-usr/parent
231 new file mode 100644
232 index 000000000000..c407ca65bdc2
233 --- /dev/null
234 +++ b/profiles/default/linux/amd64/17.1/systemd/merged-usr/parent
235 @@ -0,0 +1,2 @@
236 +..
237 +../../../../../../features/merged-usr
238
239 diff --git a/profiles/default/linux/arm/17.0/armv4t/systemd/merged-usr/eapi b/profiles/default/linux/arm/17.0/armv4t/systemd/merged-usr/eapi
240 new file mode 100644
241 index 000000000000..7ed6ff82de6b
242 --- /dev/null
243 +++ b/profiles/default/linux/arm/17.0/armv4t/systemd/merged-usr/eapi
244 @@ -0,0 +1 @@
245 +5
246
247 diff --git a/profiles/default/linux/arm/17.0/armv4t/systemd/merged-usr/parent b/profiles/default/linux/arm/17.0/armv4t/systemd/merged-usr/parent
248 new file mode 100644
249 index 000000000000..c8b1675247c9
250 --- /dev/null
251 +++ b/profiles/default/linux/arm/17.0/armv4t/systemd/merged-usr/parent
252 @@ -0,0 +1,2 @@
253 +..
254 +../../../../../../../features/merged-usr
255
256 diff --git a/profiles/default/linux/arm/17.0/armv5te/systemd/merged-usr/eapi b/profiles/default/linux/arm/17.0/armv5te/systemd/merged-usr/eapi
257 new file mode 100644
258 index 000000000000..7ed6ff82de6b
259 --- /dev/null
260 +++ b/profiles/default/linux/arm/17.0/armv5te/systemd/merged-usr/eapi
261 @@ -0,0 +1 @@
262 +5
263
264 diff --git a/profiles/default/linux/arm/17.0/armv5te/systemd/merged-usr/parent b/profiles/default/linux/arm/17.0/armv5te/systemd/merged-usr/parent
265 new file mode 100644
266 index 000000000000..c8b1675247c9
267 --- /dev/null
268 +++ b/profiles/default/linux/arm/17.0/armv5te/systemd/merged-usr/parent
269 @@ -0,0 +1,2 @@
270 +..
271 +../../../../../../../features/merged-usr
272
273 diff --git a/profiles/default/linux/arm/17.0/armv6j/systemd/merged-usr/eapi b/profiles/default/linux/arm/17.0/armv6j/systemd/merged-usr/eapi
274 new file mode 100644
275 index 000000000000..7ed6ff82de6b
276 --- /dev/null
277 +++ b/profiles/default/linux/arm/17.0/armv6j/systemd/merged-usr/eapi
278 @@ -0,0 +1 @@
279 +5
280
281 diff --git a/profiles/default/linux/arm/17.0/armv6j/systemd/merged-usr/parent b/profiles/default/linux/arm/17.0/armv6j/systemd/merged-usr/parent
282 new file mode 100644
283 index 000000000000..c8b1675247c9
284 --- /dev/null
285 +++ b/profiles/default/linux/arm/17.0/armv6j/systemd/merged-usr/parent
286 @@ -0,0 +1,2 @@
287 +..
288 +../../../../../../../features/merged-usr
289
290 diff --git a/profiles/default/linux/arm/17.0/armv7a/desktop/gnome/systemd/merged-usr/eapi b/profiles/default/linux/arm/17.0/armv7a/desktop/gnome/systemd/merged-usr/eapi
291 new file mode 100644
292 index 000000000000..7ed6ff82de6b
293 --- /dev/null
294 +++ b/profiles/default/linux/arm/17.0/armv7a/desktop/gnome/systemd/merged-usr/eapi
295 @@ -0,0 +1 @@
296 +5
297
298 diff --git a/profiles/default/linux/arm/17.0/armv7a/desktop/gnome/systemd/merged-usr/parent b/profiles/default/linux/arm/17.0/armv7a/desktop/gnome/systemd/merged-usr/parent
299 new file mode 100644
300 index 000000000000..5e9458ce54b8
301 --- /dev/null
302 +++ b/profiles/default/linux/arm/17.0/armv7a/desktop/gnome/systemd/merged-usr/parent
303 @@ -0,0 +1,2 @@
304 +..
305 +../../../../../../../../../features/merged-usr
306
307 diff --git a/profiles/default/linux/arm/17.0/armv7a/desktop/plasma/systemd/merged-usr/eapi b/profiles/default/linux/arm/17.0/armv7a/desktop/plasma/systemd/merged-usr/eapi
308 new file mode 100644
309 index 000000000000..7ed6ff82de6b
310 --- /dev/null
311 +++ b/profiles/default/linux/arm/17.0/armv7a/desktop/plasma/systemd/merged-usr/eapi
312 @@ -0,0 +1 @@
313 +5
314
315 diff --git a/profiles/default/linux/arm/17.0/armv7a/desktop/plasma/systemd/merged-usr/parent b/profiles/default/linux/arm/17.0/armv7a/desktop/plasma/systemd/merged-usr/parent
316 new file mode 100644
317 index 000000000000..5e9458ce54b8
318 --- /dev/null
319 +++ b/profiles/default/linux/arm/17.0/armv7a/desktop/plasma/systemd/merged-usr/parent
320 @@ -0,0 +1,2 @@
321 +..
322 +../../../../../../../../../features/merged-usr
323
324 diff --git a/profiles/default/linux/arm/17.0/armv7a/systemd/merged-usr/eapi b/profiles/default/linux/arm/17.0/armv7a/systemd/merged-usr/eapi
325 new file mode 100644
326 index 000000000000..7ed6ff82de6b
327 --- /dev/null
328 +++ b/profiles/default/linux/arm/17.0/armv7a/systemd/merged-usr/eapi
329 @@ -0,0 +1 @@
330 +5
331
332 diff --git a/profiles/default/linux/arm/17.0/armv7a/systemd/merged-usr/parent b/profiles/default/linux/arm/17.0/armv7a/systemd/merged-usr/parent
333 new file mode 100644
334 index 000000000000..c8b1675247c9
335 --- /dev/null
336 +++ b/profiles/default/linux/arm/17.0/armv7a/systemd/merged-usr/parent
337 @@ -0,0 +1,2 @@
338 +..
339 +../../../../../../../features/merged-usr
340
341 diff --git a/profiles/default/linux/arm/17.0/desktop/gnome/systemd/merged-usr/eapi b/profiles/default/linux/arm/17.0/desktop/gnome/systemd/merged-usr/eapi
342 new file mode 100644
343 index 000000000000..7ed6ff82de6b
344 --- /dev/null
345 +++ b/profiles/default/linux/arm/17.0/desktop/gnome/systemd/merged-usr/eapi
346 @@ -0,0 +1 @@
347 +5
348
349 diff --git a/profiles/default/linux/arm/17.0/desktop/gnome/systemd/merged-usr/parent b/profiles/default/linux/arm/17.0/desktop/gnome/systemd/merged-usr/parent
350 new file mode 100644
351 index 000000000000..1b7f7eef0a7e
352 --- /dev/null
353 +++ b/profiles/default/linux/arm/17.0/desktop/gnome/systemd/merged-usr/parent
354 @@ -0,0 +1,2 @@
355 +..
356 +../../../../../../../../features/merged-usr
357
358 diff --git a/profiles/default/linux/arm/17.0/desktop/plasma/systemd/merged-usr/eapi b/profiles/default/linux/arm/17.0/desktop/plasma/systemd/merged-usr/eapi
359 new file mode 100644
360 index 000000000000..7ed6ff82de6b
361 --- /dev/null
362 +++ b/profiles/default/linux/arm/17.0/desktop/plasma/systemd/merged-usr/eapi
363 @@ -0,0 +1 @@
364 +5
365
366 diff --git a/profiles/default/linux/arm/17.0/desktop/plasma/systemd/merged-usr/parent b/profiles/default/linux/arm/17.0/desktop/plasma/systemd/merged-usr/parent
367 new file mode 100644
368 index 000000000000..1b7f7eef0a7e
369 --- /dev/null
370 +++ b/profiles/default/linux/arm/17.0/desktop/plasma/systemd/merged-usr/parent
371 @@ -0,0 +1,2 @@
372 +..
373 +../../../../../../../../features/merged-usr
374
375 diff --git a/profiles/default/linux/arm64/17.0/desktop/gnome/systemd/merged-usr/eapi b/profiles/default/linux/arm64/17.0/desktop/gnome/systemd/merged-usr/eapi
376 new file mode 100644
377 index 000000000000..7ed6ff82de6b
378 --- /dev/null
379 +++ b/profiles/default/linux/arm64/17.0/desktop/gnome/systemd/merged-usr/eapi
380 @@ -0,0 +1 @@
381 +5
382
383 diff --git a/profiles/default/linux/arm64/17.0/desktop/gnome/systemd/merged-usr/parent b/profiles/default/linux/arm64/17.0/desktop/gnome/systemd/merged-usr/parent
384 new file mode 100644
385 index 000000000000..1b7f7eef0a7e
386 --- /dev/null
387 +++ b/profiles/default/linux/arm64/17.0/desktop/gnome/systemd/merged-usr/parent
388 @@ -0,0 +1,2 @@
389 +..
390 +../../../../../../../../features/merged-usr
391
392 diff --git a/profiles/default/linux/arm64/17.0/desktop/plasma/systemd/merged-usr/eapi b/profiles/default/linux/arm64/17.0/desktop/plasma/systemd/merged-usr/eapi
393 new file mode 100644
394 index 000000000000..7ed6ff82de6b
395 --- /dev/null
396 +++ b/profiles/default/linux/arm64/17.0/desktop/plasma/systemd/merged-usr/eapi
397 @@ -0,0 +1 @@
398 +5
399
400 diff --git a/profiles/default/linux/arm64/17.0/desktop/plasma/systemd/merged-usr/parent b/profiles/default/linux/arm64/17.0/desktop/plasma/systemd/merged-usr/parent
401 new file mode 100644
402 index 000000000000..1b7f7eef0a7e
403 --- /dev/null
404 +++ b/profiles/default/linux/arm64/17.0/desktop/plasma/systemd/merged-usr/parent
405 @@ -0,0 +1,2 @@
406 +..
407 +../../../../../../../../features/merged-usr
408
409 diff --git a/profiles/default/linux/arm64/17.0/desktop/systemd/merged-usr/eapi b/profiles/default/linux/arm64/17.0/desktop/systemd/merged-usr/eapi
410 new file mode 100644
411 index 000000000000..7ed6ff82de6b
412 --- /dev/null
413 +++ b/profiles/default/linux/arm64/17.0/desktop/systemd/merged-usr/eapi
414 @@ -0,0 +1 @@
415 +5
416
417 diff --git a/profiles/default/linux/arm64/17.0/desktop/systemd/merged-usr/parent b/profiles/default/linux/arm64/17.0/desktop/systemd/merged-usr/parent
418 new file mode 100644
419 index 000000000000..c8b1675247c9
420 --- /dev/null
421 +++ b/profiles/default/linux/arm64/17.0/desktop/systemd/merged-usr/parent
422 @@ -0,0 +1,2 @@
423 +..
424 +../../../../../../../features/merged-usr
425
426 diff --git a/profiles/default/linux/arm64/17.0/systemd/merged-usr/eapi b/profiles/default/linux/arm64/17.0/systemd/merged-usr/eapi
427 new file mode 100644
428 index 000000000000..7ed6ff82de6b
429 --- /dev/null
430 +++ b/profiles/default/linux/arm64/17.0/systemd/merged-usr/eapi
431 @@ -0,0 +1 @@
432 +5
433
434 diff --git a/profiles/default/linux/arm64/17.0/systemd/merged-usr/parent b/profiles/default/linux/arm64/17.0/systemd/merged-usr/parent
435 new file mode 100644
436 index 000000000000..c407ca65bdc2
437 --- /dev/null
438 +++ b/profiles/default/linux/arm64/17.0/systemd/merged-usr/parent
439 @@ -0,0 +1,2 @@
440 +..
441 +../../../../../../features/merged-usr
442
443 diff --git a/profiles/default/linux/hppa/17.0/systemd/merged-usr/eapi b/profiles/default/linux/hppa/17.0/systemd/merged-usr/eapi
444 new file mode 100644
445 index 000000000000..7ed6ff82de6b
446 --- /dev/null
447 +++ b/profiles/default/linux/hppa/17.0/systemd/merged-usr/eapi
448 @@ -0,0 +1 @@
449 +5
450
451 diff --git a/profiles/default/linux/hppa/17.0/systemd/merged-usr/parent b/profiles/default/linux/hppa/17.0/systemd/merged-usr/parent
452 new file mode 100644
453 index 000000000000..c407ca65bdc2
454 --- /dev/null
455 +++ b/profiles/default/linux/hppa/17.0/systemd/merged-usr/parent
456 @@ -0,0 +1,2 @@
457 +..
458 +../../../../../../features/merged-usr
459
460 diff --git a/profiles/default/linux/ia64/17.0/desktop/gnome/systemd/merged-usr/eapi b/profiles/default/linux/ia64/17.0/desktop/gnome/systemd/merged-usr/eapi
461 new file mode 100644
462 index 000000000000..7ed6ff82de6b
463 --- /dev/null
464 +++ b/profiles/default/linux/ia64/17.0/desktop/gnome/systemd/merged-usr/eapi
465 @@ -0,0 +1 @@
466 +5
467
468 diff --git a/profiles/default/linux/ia64/17.0/desktop/gnome/systemd/merged-usr/parent b/profiles/default/linux/ia64/17.0/desktop/gnome/systemd/merged-usr/parent
469 new file mode 100644
470 index 000000000000..1b7f7eef0a7e
471 --- /dev/null
472 +++ b/profiles/default/linux/ia64/17.0/desktop/gnome/systemd/merged-usr/parent
473 @@ -0,0 +1,2 @@
474 +..
475 +../../../../../../../../features/merged-usr
476
477 diff --git a/profiles/default/linux/ia64/17.0/systemd/merged-usr/eapi b/profiles/default/linux/ia64/17.0/systemd/merged-usr/eapi
478 new file mode 100644
479 index 000000000000..7ed6ff82de6b
480 --- /dev/null
481 +++ b/profiles/default/linux/ia64/17.0/systemd/merged-usr/eapi
482 @@ -0,0 +1 @@
483 +5
484
485 diff --git a/profiles/default/linux/ia64/17.0/systemd/merged-usr/parent b/profiles/default/linux/ia64/17.0/systemd/merged-usr/parent
486 new file mode 100644
487 index 000000000000..c407ca65bdc2
488 --- /dev/null
489 +++ b/profiles/default/linux/ia64/17.0/systemd/merged-usr/parent
490 @@ -0,0 +1,2 @@
491 +..
492 +../../../../../../features/merged-usr
493
494 diff --git a/profiles/default/linux/loong/22.0/la64v100/lp64d/desktop/systemd/merged-usr/eapi b/profiles/default/linux/loong/22.0/la64v100/lp64d/desktop/systemd/merged-usr/eapi
495 new file mode 100644
496 index 000000000000..7ed6ff82de6b
497 --- /dev/null
498 +++ b/profiles/default/linux/loong/22.0/la64v100/lp64d/desktop/systemd/merged-usr/eapi
499 @@ -0,0 +1 @@
500 +5
501
502 diff --git a/profiles/default/linux/loong/22.0/la64v100/lp64d/desktop/systemd/merged-usr/parent b/profiles/default/linux/loong/22.0/la64v100/lp64d/desktop/systemd/merged-usr/parent
503 new file mode 100644
504 index 000000000000..5e9458ce54b8
505 --- /dev/null
506 +++ b/profiles/default/linux/loong/22.0/la64v100/lp64d/desktop/systemd/merged-usr/parent
507 @@ -0,0 +1,2 @@
508 +..
509 +../../../../../../../../../features/merged-usr
510
511 diff --git a/profiles/default/linux/loong/22.0/la64v100/lp64d/systemd/merged-usr/eapi b/profiles/default/linux/loong/22.0/la64v100/lp64d/systemd/merged-usr/eapi
512 new file mode 100644
513 index 000000000000..7ed6ff82de6b
514 --- /dev/null
515 +++ b/profiles/default/linux/loong/22.0/la64v100/lp64d/systemd/merged-usr/eapi
516 @@ -0,0 +1 @@
517 +5
518
519 diff --git a/profiles/default/linux/loong/22.0/la64v100/lp64d/systemd/merged-usr/parent b/profiles/default/linux/loong/22.0/la64v100/lp64d/systemd/merged-usr/parent
520 new file mode 100644
521 index 000000000000..1b7f7eef0a7e
522 --- /dev/null
523 +++ b/profiles/default/linux/loong/22.0/la64v100/lp64d/systemd/merged-usr/parent
524 @@ -0,0 +1,2 @@
525 +..
526 +../../../../../../../../features/merged-usr
527
528 diff --git a/profiles/default/linux/m68k/17.0/systemd/merged-usr/eapi b/profiles/default/linux/m68k/17.0/systemd/merged-usr/eapi
529 new file mode 100644
530 index 000000000000..7ed6ff82de6b
531 --- /dev/null
532 +++ b/profiles/default/linux/m68k/17.0/systemd/merged-usr/eapi
533 @@ -0,0 +1 @@
534 +5
535
536 diff --git a/profiles/default/linux/m68k/17.0/systemd/merged-usr/parent b/profiles/default/linux/m68k/17.0/systemd/merged-usr/parent
537 new file mode 100644
538 index 000000000000..c407ca65bdc2
539 --- /dev/null
540 +++ b/profiles/default/linux/m68k/17.0/systemd/merged-usr/parent
541 @@ -0,0 +1,2 @@
542 +..
543 +../../../../../../features/merged-usr
544
545 diff --git a/profiles/default/linux/mips/17.0/mipsel/multilib/n64/systemd/merged-usr/eapi b/profiles/default/linux/mips/17.0/mipsel/multilib/n64/systemd/merged-usr/eapi
546 new file mode 100644
547 index 000000000000..7ed6ff82de6b
548 --- /dev/null
549 +++ b/profiles/default/linux/mips/17.0/mipsel/multilib/n64/systemd/merged-usr/eapi
550 @@ -0,0 +1 @@
551 +5
552
553 diff --git a/profiles/default/linux/mips/17.0/mipsel/multilib/n64/systemd/merged-usr/parent b/profiles/default/linux/mips/17.0/mipsel/multilib/n64/systemd/merged-usr/parent
554 new file mode 100644
555 index 000000000000..5e9458ce54b8
556 --- /dev/null
557 +++ b/profiles/default/linux/mips/17.0/mipsel/multilib/n64/systemd/merged-usr/parent
558 @@ -0,0 +1,2 @@
559 +..
560 +../../../../../../../../../features/merged-usr
561
562 diff --git a/profiles/default/linux/mips/17.0/mipsel/n64/systemd/merged-usr/eapi b/profiles/default/linux/mips/17.0/mipsel/n64/systemd/merged-usr/eapi
563 new file mode 100644
564 index 000000000000..7ed6ff82de6b
565 --- /dev/null
566 +++ b/profiles/default/linux/mips/17.0/mipsel/n64/systemd/merged-usr/eapi
567 @@ -0,0 +1 @@
568 +5
569
570 diff --git a/profiles/default/linux/mips/17.0/mipsel/n64/systemd/merged-usr/parent b/profiles/default/linux/mips/17.0/mipsel/n64/systemd/merged-usr/parent
571 new file mode 100644
572 index 000000000000..1b7f7eef0a7e
573 --- /dev/null
574 +++ b/profiles/default/linux/mips/17.0/mipsel/n64/systemd/merged-usr/parent
575 @@ -0,0 +1,2 @@
576 +..
577 +../../../../../../../../features/merged-usr
578
579 diff --git a/profiles/default/linux/powerpc/ppc32/17.0/desktop/gnome/systemd/merged-usr/eapi b/profiles/default/linux/powerpc/ppc32/17.0/desktop/gnome/systemd/merged-usr/eapi
580 new file mode 100644
581 index 000000000000..7ed6ff82de6b
582 --- /dev/null
583 +++ b/profiles/default/linux/powerpc/ppc32/17.0/desktop/gnome/systemd/merged-usr/eapi
584 @@ -0,0 +1 @@
585 +5
586
587 diff --git a/profiles/default/linux/powerpc/ppc32/17.0/desktop/gnome/systemd/merged-usr/parent b/profiles/default/linux/powerpc/ppc32/17.0/desktop/gnome/systemd/merged-usr/parent
588 new file mode 100644
589 index 000000000000..5e9458ce54b8
590 --- /dev/null
591 +++ b/profiles/default/linux/powerpc/ppc32/17.0/desktop/gnome/systemd/merged-usr/parent
592 @@ -0,0 +1,2 @@
593 +..
594 +../../../../../../../../../features/merged-usr
595
596 diff --git a/profiles/default/linux/powerpc/ppc64/17.0/32bit-userland/desktop/gnome/systemd/merged-usr/eapi b/profiles/default/linux/powerpc/ppc64/17.0/32bit-userland/desktop/gnome/systemd/merged-usr/eapi
597 new file mode 100644
598 index 000000000000..7ed6ff82de6b
599 --- /dev/null
600 +++ b/profiles/default/linux/powerpc/ppc64/17.0/32bit-userland/desktop/gnome/systemd/merged-usr/eapi
601 @@ -0,0 +1 @@
602 +5
603
604 diff --git a/profiles/default/linux/powerpc/ppc64/17.0/32bit-userland/desktop/gnome/systemd/merged-usr/parent b/profiles/default/linux/powerpc/ppc64/17.0/32bit-userland/desktop/gnome/systemd/merged-usr/parent
605 new file mode 100644
606 index 000000000000..05b6f4918b26
607 --- /dev/null
608 +++ b/profiles/default/linux/powerpc/ppc64/17.0/32bit-userland/desktop/gnome/systemd/merged-usr/parent
609 @@ -0,0 +1,2 @@
610 +..
611 +../../../../../../../../../../features/merged-usr
612
613 diff --git a/profiles/default/linux/powerpc/ppc64/17.0/64bit-userland/desktop/gnome/systemd/merged-usr/eapi b/profiles/default/linux/powerpc/ppc64/17.0/64bit-userland/desktop/gnome/systemd/merged-usr/eapi
614 new file mode 100644
615 index 000000000000..7ed6ff82de6b
616 --- /dev/null
617 +++ b/profiles/default/linux/powerpc/ppc64/17.0/64bit-userland/desktop/gnome/systemd/merged-usr/eapi
618 @@ -0,0 +1 @@
619 +5
620
621 diff --git a/profiles/default/linux/powerpc/ppc64/17.0/64bit-userland/desktop/gnome/systemd/merged-usr/parent b/profiles/default/linux/powerpc/ppc64/17.0/64bit-userland/desktop/gnome/systemd/merged-usr/parent
622 new file mode 100644
623 index 000000000000..05b6f4918b26
624 --- /dev/null
625 +++ b/profiles/default/linux/powerpc/ppc64/17.0/64bit-userland/desktop/gnome/systemd/merged-usr/parent
626 @@ -0,0 +1,2 @@
627 +..
628 +../../../../../../../../../../features/merged-usr
629
630 diff --git a/profiles/default/linux/ppc/17.0/desktop/gnome/systemd/merged-usr/eapi b/profiles/default/linux/ppc/17.0/desktop/gnome/systemd/merged-usr/eapi
631 new file mode 100644
632 index 000000000000..7ed6ff82de6b
633 --- /dev/null
634 +++ b/profiles/default/linux/ppc/17.0/desktop/gnome/systemd/merged-usr/eapi
635 @@ -0,0 +1 @@
636 +5
637
638 diff --git a/profiles/default/linux/ppc/17.0/desktop/gnome/systemd/merged-usr/parent b/profiles/default/linux/ppc/17.0/desktop/gnome/systemd/merged-usr/parent
639 new file mode 100644
640 index 000000000000..1b7f7eef0a7e
641 --- /dev/null
642 +++ b/profiles/default/linux/ppc/17.0/desktop/gnome/systemd/merged-usr/parent
643 @@ -0,0 +1,2 @@
644 +..
645 +../../../../../../../../features/merged-usr
646
647 diff --git a/profiles/default/linux/ppc/17.0/systemd/merged-usr/eapi b/profiles/default/linux/ppc/17.0/systemd/merged-usr/eapi
648 new file mode 100644
649 index 000000000000..7ed6ff82de6b
650 --- /dev/null
651 +++ b/profiles/default/linux/ppc/17.0/systemd/merged-usr/eapi
652 @@ -0,0 +1 @@
653 +5
654
655 diff --git a/profiles/default/linux/ppc/17.0/systemd/merged-usr/parent b/profiles/default/linux/ppc/17.0/systemd/merged-usr/parent
656 new file mode 100644
657 index 000000000000..c407ca65bdc2
658 --- /dev/null
659 +++ b/profiles/default/linux/ppc/17.0/systemd/merged-usr/parent
660 @@ -0,0 +1,2 @@
661 +..
662 +../../../../../../features/merged-usr
663
664 diff --git a/profiles/default/linux/ppc64/17.0/desktop/gnome/systemd/merged-usr/eapi b/profiles/default/linux/ppc64/17.0/desktop/gnome/systemd/merged-usr/eapi
665 new file mode 100644
666 index 000000000000..7ed6ff82de6b
667 --- /dev/null
668 +++ b/profiles/default/linux/ppc64/17.0/desktop/gnome/systemd/merged-usr/eapi
669 @@ -0,0 +1 @@
670 +5
671
672 diff --git a/profiles/default/linux/ppc64/17.0/desktop/gnome/systemd/merged-usr/parent b/profiles/default/linux/ppc64/17.0/desktop/gnome/systemd/merged-usr/parent
673 new file mode 100644
674 index 000000000000..1b7f7eef0a7e
675 --- /dev/null
676 +++ b/profiles/default/linux/ppc64/17.0/desktop/gnome/systemd/merged-usr/parent
677 @@ -0,0 +1,2 @@
678 +..
679 +../../../../../../../../features/merged-usr
680
681 diff --git a/profiles/default/linux/ppc64/17.0/systemd/merged-usr/eapi b/profiles/default/linux/ppc64/17.0/systemd/merged-usr/eapi
682 new file mode 100644
683 index 000000000000..7ed6ff82de6b
684 --- /dev/null
685 +++ b/profiles/default/linux/ppc64/17.0/systemd/merged-usr/eapi
686 @@ -0,0 +1 @@
687 +5
688
689 diff --git a/profiles/default/linux/ppc64/17.0/systemd/merged-usr/parent b/profiles/default/linux/ppc64/17.0/systemd/merged-usr/parent
690 new file mode 100644
691 index 000000000000..c407ca65bdc2
692 --- /dev/null
693 +++ b/profiles/default/linux/ppc64/17.0/systemd/merged-usr/parent
694 @@ -0,0 +1,2 @@
695 +..
696 +../../../../../../features/merged-usr
697
698 diff --git a/profiles/default/linux/ppc64le/17.0/desktop/gnome/systemd/merged-usr/eapi b/profiles/default/linux/ppc64le/17.0/desktop/gnome/systemd/merged-usr/eapi
699 new file mode 100644
700 index 000000000000..7ed6ff82de6b
701 --- /dev/null
702 +++ b/profiles/default/linux/ppc64le/17.0/desktop/gnome/systemd/merged-usr/eapi
703 @@ -0,0 +1 @@
704 +5
705
706 diff --git a/profiles/default/linux/ppc64le/17.0/desktop/gnome/systemd/merged-usr/parent b/profiles/default/linux/ppc64le/17.0/desktop/gnome/systemd/merged-usr/parent
707 new file mode 100644
708 index 000000000000..1b7f7eef0a7e
709 --- /dev/null
710 +++ b/profiles/default/linux/ppc64le/17.0/desktop/gnome/systemd/merged-usr/parent
711 @@ -0,0 +1,2 @@
712 +..
713 +../../../../../../../../features/merged-usr
714
715 diff --git a/profiles/default/linux/ppc64le/17.0/desktop/plasma/systemd/merged-usr/eapi b/profiles/default/linux/ppc64le/17.0/desktop/plasma/systemd/merged-usr/eapi
716 new file mode 100644
717 index 000000000000..7ed6ff82de6b
718 --- /dev/null
719 +++ b/profiles/default/linux/ppc64le/17.0/desktop/plasma/systemd/merged-usr/eapi
720 @@ -0,0 +1 @@
721 +5
722
723 diff --git a/profiles/default/linux/ppc64le/17.0/desktop/plasma/systemd/merged-usr/parent b/profiles/default/linux/ppc64le/17.0/desktop/plasma/systemd/merged-usr/parent
724 new file mode 100644
725 index 000000000000..1b7f7eef0a7e
726 --- /dev/null
727 +++ b/profiles/default/linux/ppc64le/17.0/desktop/plasma/systemd/merged-usr/parent
728 @@ -0,0 +1,2 @@
729 +..
730 +../../../../../../../../features/merged-usr
731
732 diff --git a/profiles/default/linux/ppc64le/17.0/systemd/merged-usr/eapi b/profiles/default/linux/ppc64le/17.0/systemd/merged-usr/eapi
733 new file mode 100644
734 index 000000000000..7ed6ff82de6b
735 --- /dev/null
736 +++ b/profiles/default/linux/ppc64le/17.0/systemd/merged-usr/eapi
737 @@ -0,0 +1 @@
738 +5
739
740 diff --git a/profiles/default/linux/ppc64le/17.0/systemd/merged-usr/parent b/profiles/default/linux/ppc64le/17.0/systemd/merged-usr/parent
741 new file mode 100644
742 index 000000000000..c407ca65bdc2
743 --- /dev/null
744 +++ b/profiles/default/linux/ppc64le/17.0/systemd/merged-usr/parent
745 @@ -0,0 +1,2 @@
746 +..
747 +../../../../../../features/merged-usr
748
749 diff --git a/profiles/default/linux/riscv/20.0/rv64gc/lp64/desktop/gnome/systemd/merged-usr/eapi b/profiles/default/linux/riscv/20.0/rv64gc/lp64/desktop/gnome/systemd/merged-usr/eapi
750 new file mode 100644
751 index 000000000000..7ed6ff82de6b
752 --- /dev/null
753 +++ b/profiles/default/linux/riscv/20.0/rv64gc/lp64/desktop/gnome/systemd/merged-usr/eapi
754 @@ -0,0 +1 @@
755 +5
756
757 diff --git a/profiles/default/linux/riscv/20.0/rv64gc/lp64/desktop/gnome/systemd/merged-usr/parent b/profiles/default/linux/riscv/20.0/rv64gc/lp64/desktop/gnome/systemd/merged-usr/parent
758 new file mode 100644
759 index 000000000000..05b6f4918b26
760 --- /dev/null
761 +++ b/profiles/default/linux/riscv/20.0/rv64gc/lp64/desktop/gnome/systemd/merged-usr/parent
762 @@ -0,0 +1,2 @@
763 +..
764 +../../../../../../../../../../features/merged-usr
765
766 diff --git a/profiles/default/linux/riscv/20.0/rv64gc/lp64/desktop/plasma/systemd/merged-usr/eapi b/profiles/default/linux/riscv/20.0/rv64gc/lp64/desktop/plasma/systemd/merged-usr/eapi
767 new file mode 100644
768 index 000000000000..7ed6ff82de6b
769 --- /dev/null
770 +++ b/profiles/default/linux/riscv/20.0/rv64gc/lp64/desktop/plasma/systemd/merged-usr/eapi
771 @@ -0,0 +1 @@
772 +5
773
774 diff --git a/profiles/default/linux/riscv/20.0/rv64gc/lp64/desktop/plasma/systemd/merged-usr/parent b/profiles/default/linux/riscv/20.0/rv64gc/lp64/desktop/plasma/systemd/merged-usr/parent
775 new file mode 100644
776 index 000000000000..05b6f4918b26
777 --- /dev/null
778 +++ b/profiles/default/linux/riscv/20.0/rv64gc/lp64/desktop/plasma/systemd/merged-usr/parent
779 @@ -0,0 +1,2 @@
780 +..
781 +../../../../../../../../../../features/merged-usr
782
783 diff --git a/profiles/default/linux/riscv/20.0/rv64gc/lp64/desktop/systemd/merged-usr/eapi b/profiles/default/linux/riscv/20.0/rv64gc/lp64/desktop/systemd/merged-usr/eapi
784 new file mode 100644
785 index 000000000000..7ed6ff82de6b
786 --- /dev/null
787 +++ b/profiles/default/linux/riscv/20.0/rv64gc/lp64/desktop/systemd/merged-usr/eapi
788 @@ -0,0 +1 @@
789 +5
790
791 diff --git a/profiles/default/linux/riscv/20.0/rv64gc/lp64/desktop/systemd/merged-usr/parent b/profiles/default/linux/riscv/20.0/rv64gc/lp64/desktop/systemd/merged-usr/parent
792 new file mode 100644
793 index 000000000000..5e9458ce54b8
794 --- /dev/null
795 +++ b/profiles/default/linux/riscv/20.0/rv64gc/lp64/desktop/systemd/merged-usr/parent
796 @@ -0,0 +1,2 @@
797 +..
798 +../../../../../../../../../features/merged-usr
799
800 diff --git a/profiles/default/linux/riscv/20.0/rv64gc/lp64/systemd/merged-usr/eapi b/profiles/default/linux/riscv/20.0/rv64gc/lp64/systemd/merged-usr/eapi
801 new file mode 100644
802 index 000000000000..7ed6ff82de6b
803 --- /dev/null
804 +++ b/profiles/default/linux/riscv/20.0/rv64gc/lp64/systemd/merged-usr/eapi
805 @@ -0,0 +1 @@
806 +5
807
808 diff --git a/profiles/default/linux/riscv/20.0/rv64gc/lp64/systemd/merged-usr/parent b/profiles/default/linux/riscv/20.0/rv64gc/lp64/systemd/merged-usr/parent
809 new file mode 100644
810 index 000000000000..1b7f7eef0a7e
811 --- /dev/null
812 +++ b/profiles/default/linux/riscv/20.0/rv64gc/lp64/systemd/merged-usr/parent
813 @@ -0,0 +1,2 @@
814 +..
815 +../../../../../../../../features/merged-usr
816
817 diff --git a/profiles/default/linux/riscv/20.0/rv64gc/lp64d/desktop/gnome/systemd/merged-usr/eapi b/profiles/default/linux/riscv/20.0/rv64gc/lp64d/desktop/gnome/systemd/merged-usr/eapi
818 new file mode 100644
819 index 000000000000..7ed6ff82de6b
820 --- /dev/null
821 +++ b/profiles/default/linux/riscv/20.0/rv64gc/lp64d/desktop/gnome/systemd/merged-usr/eapi
822 @@ -0,0 +1 @@
823 +5
824
825 diff --git a/profiles/default/linux/riscv/20.0/rv64gc/lp64d/desktop/gnome/systemd/merged-usr/parent b/profiles/default/linux/riscv/20.0/rv64gc/lp64d/desktop/gnome/systemd/merged-usr/parent
826 new file mode 100644
827 index 000000000000..05b6f4918b26
828 --- /dev/null
829 +++ b/profiles/default/linux/riscv/20.0/rv64gc/lp64d/desktop/gnome/systemd/merged-usr/parent
830 @@ -0,0 +1,2 @@
831 +..
832 +../../../../../../../../../../features/merged-usr
833
834 diff --git a/profiles/default/linux/riscv/20.0/rv64gc/lp64d/desktop/plasma/systemd/merged-usr/eapi b/profiles/default/linux/riscv/20.0/rv64gc/lp64d/desktop/plasma/systemd/merged-usr/eapi
835 new file mode 100644
836 index 000000000000..7ed6ff82de6b
837 --- /dev/null
838 +++ b/profiles/default/linux/riscv/20.0/rv64gc/lp64d/desktop/plasma/systemd/merged-usr/eapi
839 @@ -0,0 +1 @@
840 +5
841
842 diff --git a/profiles/default/linux/riscv/20.0/rv64gc/lp64d/desktop/plasma/systemd/merged-usr/parent b/profiles/default/linux/riscv/20.0/rv64gc/lp64d/desktop/plasma/systemd/merged-usr/parent
843 new file mode 100644
844 index 000000000000..05b6f4918b26
845 --- /dev/null
846 +++ b/profiles/default/linux/riscv/20.0/rv64gc/lp64d/desktop/plasma/systemd/merged-usr/parent
847 @@ -0,0 +1,2 @@
848 +..
849 +../../../../../../../../../../features/merged-usr
850
851 diff --git a/profiles/default/linux/riscv/20.0/rv64gc/lp64d/desktop/systemd/merged-usr/eapi b/profiles/default/linux/riscv/20.0/rv64gc/lp64d/desktop/systemd/merged-usr/eapi
852 new file mode 100644
853 index 000000000000..7ed6ff82de6b
854 --- /dev/null
855 +++ b/profiles/default/linux/riscv/20.0/rv64gc/lp64d/desktop/systemd/merged-usr/eapi
856 @@ -0,0 +1 @@
857 +5
858
859 diff --git a/profiles/default/linux/riscv/20.0/rv64gc/lp64d/desktop/systemd/merged-usr/parent b/profiles/default/linux/riscv/20.0/rv64gc/lp64d/desktop/systemd/merged-usr/parent
860 new file mode 100644
861 index 000000000000..5e9458ce54b8
862 --- /dev/null
863 +++ b/profiles/default/linux/riscv/20.0/rv64gc/lp64d/desktop/systemd/merged-usr/parent
864 @@ -0,0 +1,2 @@
865 +..
866 +../../../../../../../../../features/merged-usr
867
868 diff --git a/profiles/default/linux/riscv/20.0/rv64gc/lp64d/systemd/merged-usr/eapi b/profiles/default/linux/riscv/20.0/rv64gc/lp64d/systemd/merged-usr/eapi
869 new file mode 100644
870 index 000000000000..7ed6ff82de6b
871 --- /dev/null
872 +++ b/profiles/default/linux/riscv/20.0/rv64gc/lp64d/systemd/merged-usr/eapi
873 @@ -0,0 +1 @@
874 +5
875
876 diff --git a/profiles/default/linux/riscv/20.0/rv64gc/lp64d/systemd/merged-usr/parent b/profiles/default/linux/riscv/20.0/rv64gc/lp64d/systemd/merged-usr/parent
877 new file mode 100644
878 index 000000000000..1b7f7eef0a7e
879 --- /dev/null
880 +++ b/profiles/default/linux/riscv/20.0/rv64gc/lp64d/systemd/merged-usr/parent
881 @@ -0,0 +1,2 @@
882 +..
883 +../../../../../../../../features/merged-usr
884
885 diff --git a/profiles/default/linux/riscv/20.0/rv64gc/multilib/systemd/merged-usr/eapi b/profiles/default/linux/riscv/20.0/rv64gc/multilib/systemd/merged-usr/eapi
886 new file mode 100644
887 index 000000000000..7ed6ff82de6b
888 --- /dev/null
889 +++ b/profiles/default/linux/riscv/20.0/rv64gc/multilib/systemd/merged-usr/eapi
890 @@ -0,0 +1 @@
891 +5
892
893 diff --git a/profiles/default/linux/riscv/20.0/rv64gc/multilib/systemd/merged-usr/parent b/profiles/default/linux/riscv/20.0/rv64gc/multilib/systemd/merged-usr/parent
894 new file mode 100644
895 index 000000000000..1b7f7eef0a7e
896 --- /dev/null
897 +++ b/profiles/default/linux/riscv/20.0/rv64gc/multilib/systemd/merged-usr/parent
898 @@ -0,0 +1,2 @@
899 +..
900 +../../../../../../../../features/merged-usr
901
902 diff --git a/profiles/default/linux/s390/17.0/s390x/systemd/merged-usr/eapi b/profiles/default/linux/s390/17.0/s390x/systemd/merged-usr/eapi
903 new file mode 100644
904 index 000000000000..7ed6ff82de6b
905 --- /dev/null
906 +++ b/profiles/default/linux/s390/17.0/s390x/systemd/merged-usr/eapi
907 @@ -0,0 +1 @@
908 +5
909
910 diff --git a/profiles/default/linux/s390/17.0/s390x/systemd/merged-usr/parent b/profiles/default/linux/s390/17.0/s390x/systemd/merged-usr/parent
911 new file mode 100644
912 index 000000000000..c8b1675247c9
913 --- /dev/null
914 +++ b/profiles/default/linux/s390/17.0/s390x/systemd/merged-usr/parent
915 @@ -0,0 +1,2 @@
916 +..
917 +../../../../../../../features/merged-usr
918
919 diff --git a/profiles/default/linux/s390/17.0/systemd/merged-usr/eapi b/profiles/default/linux/s390/17.0/systemd/merged-usr/eapi
920 new file mode 100644
921 index 000000000000..7ed6ff82de6b
922 --- /dev/null
923 +++ b/profiles/default/linux/s390/17.0/systemd/merged-usr/eapi
924 @@ -0,0 +1 @@
925 +5
926
927 diff --git a/profiles/default/linux/s390/17.0/systemd/merged-usr/parent b/profiles/default/linux/s390/17.0/systemd/merged-usr/parent
928 new file mode 100644
929 index 000000000000..c407ca65bdc2
930 --- /dev/null
931 +++ b/profiles/default/linux/s390/17.0/systemd/merged-usr/parent
932 @@ -0,0 +1,2 @@
933 +..
934 +../../../../../../features/merged-usr
935
936 diff --git a/profiles/default/linux/sparc/17.0/64ul/systemd/merged-usr/eapi b/profiles/default/linux/sparc/17.0/64ul/systemd/merged-usr/eapi
937 new file mode 100644
938 index 000000000000..7ed6ff82de6b
939 --- /dev/null
940 +++ b/profiles/default/linux/sparc/17.0/64ul/systemd/merged-usr/eapi
941 @@ -0,0 +1 @@
942 +5
943
944 diff --git a/profiles/default/linux/sparc/17.0/64ul/systemd/merged-usr/parent b/profiles/default/linux/sparc/17.0/64ul/systemd/merged-usr/parent
945 new file mode 100644
946 index 000000000000..c8b1675247c9
947 --- /dev/null
948 +++ b/profiles/default/linux/sparc/17.0/64ul/systemd/merged-usr/parent
949 @@ -0,0 +1,2 @@
950 +..
951 +../../../../../../../features/merged-usr
952
953 diff --git a/profiles/default/linux/sparc/17.0/systemd/merged-usr/eapi b/profiles/default/linux/sparc/17.0/systemd/merged-usr/eapi
954 new file mode 100644
955 index 000000000000..7ed6ff82de6b
956 --- /dev/null
957 +++ b/profiles/default/linux/sparc/17.0/systemd/merged-usr/eapi
958 @@ -0,0 +1 @@
959 +5
960
961 diff --git a/profiles/default/linux/sparc/17.0/systemd/merged-usr/parent b/profiles/default/linux/sparc/17.0/systemd/merged-usr/parent
962 new file mode 100644
963 index 000000000000..c407ca65bdc2
964 --- /dev/null
965 +++ b/profiles/default/linux/sparc/17.0/systemd/merged-usr/parent
966 @@ -0,0 +1,2 @@
967 +..
968 +../../../../../../features/merged-usr
969
970 diff --git a/profiles/default/linux/x86/17.0/desktop/gnome/systemd/merged-usr/eapi b/profiles/default/linux/x86/17.0/desktop/gnome/systemd/merged-usr/eapi
971 new file mode 100644
972 index 000000000000..7ed6ff82de6b
973 --- /dev/null
974 +++ b/profiles/default/linux/x86/17.0/desktop/gnome/systemd/merged-usr/eapi
975 @@ -0,0 +1 @@
976 +5
977
978 diff --git a/profiles/default/linux/x86/17.0/desktop/gnome/systemd/merged-usr/parent b/profiles/default/linux/x86/17.0/desktop/gnome/systemd/merged-usr/parent
979 new file mode 100644
980 index 000000000000..1b7f7eef0a7e
981 --- /dev/null
982 +++ b/profiles/default/linux/x86/17.0/desktop/gnome/systemd/merged-usr/parent
983 @@ -0,0 +1,2 @@
984 +..
985 +../../../../../../../../features/merged-usr
986
987 diff --git a/profiles/default/linux/x86/17.0/desktop/plasma/systemd/merged-usr/eapi b/profiles/default/linux/x86/17.0/desktop/plasma/systemd/merged-usr/eapi
988 new file mode 100644
989 index 000000000000..7ed6ff82de6b
990 --- /dev/null
991 +++ b/profiles/default/linux/x86/17.0/desktop/plasma/systemd/merged-usr/eapi
992 @@ -0,0 +1 @@
993 +5
994
995 diff --git a/profiles/default/linux/x86/17.0/desktop/plasma/systemd/merged-usr/parent b/profiles/default/linux/x86/17.0/desktop/plasma/systemd/merged-usr/parent
996 new file mode 100644
997 index 000000000000..1b7f7eef0a7e
998 --- /dev/null
999 +++ b/profiles/default/linux/x86/17.0/desktop/plasma/systemd/merged-usr/parent
1000 @@ -0,0 +1,2 @@
1001 +..
1002 +../../../../../../../../features/merged-usr
1003
1004 diff --git a/profiles/default/linux/x86/17.0/systemd/merged-usr/eapi b/profiles/default/linux/x86/17.0/systemd/merged-usr/eapi
1005 new file mode 100644
1006 index 000000000000..7ed6ff82de6b
1007 --- /dev/null
1008 +++ b/profiles/default/linux/x86/17.0/systemd/merged-usr/eapi
1009 @@ -0,0 +1 @@
1010 +5
1011
1012 diff --git a/profiles/default/linux/x86/17.0/systemd/merged-usr/parent b/profiles/default/linux/x86/17.0/systemd/merged-usr/parent
1013 new file mode 100644
1014 index 000000000000..c407ca65bdc2
1015 --- /dev/null
1016 +++ b/profiles/default/linux/x86/17.0/systemd/merged-usr/parent
1017 @@ -0,0 +1,2 @@
1018 +..
1019 +../../../../../../features/merged-usr