[gentoo-dev] Add systemd/merged-usr profiles

[Mike Gilbert]

This patch series adds a "merged-usr" feature profile, and subprofiles
for each systemd profile.

As background: systemd upstream is preparing to drop support for
split-usr systems soon. All systemd users on Gentoo will eventually
need to migrate to a merged-usr system.

[Mike Gilbert]

Signed-off-by: Mike Gilbert <flo...@gentoo.org>
---
.../linux/alpha/17.0/desktop/gnome/systemd/merged-usr/eapi | 1 +
.../linux/alpha/17.0/desktop/gnome/systemd/merged-usr/parent | 2 ++
profiles/default/linux/alpha/17.0/systemd/merged-usr/eapi | 1 +
profiles/default/linux/alpha/17.0/systemd/merged-usr/parent | 2 ++
.../linux/amd64/17.1/desktop/gnome/systemd/merged-usr/eapi | 1 +
.../linux/amd64/17.1/desktop/gnome/systemd/merged-usr/parent | 2 ++
.../linux/amd64/17.1/desktop/plasma/systemd/merged-usr/eapi | 1 +
.../linux/amd64/17.1/desktop/plasma/systemd/merged-usr/parent | 2 ++
.../default/linux/amd64/17.1/desktop/systemd/merged-usr/eapi | 1 +
.../default/linux/amd64/17.1/desktop/systemd/merged-usr/parent | 2 ++
.../linux/amd64/17.1/no-multilib/systemd/merged-usr/eapi | 1 +
.../linux/amd64/17.1/no-multilib/systemd/merged-usr/parent | 2 ++
profiles/default/linux/amd64/17.1/systemd/merged-usr/eapi | 1 +
profiles/default/linux/amd64/17.1/systemd/merged-usr/parent | 2 ++
profiles/default/linux/arm/17.0/armv4t/systemd/merged-usr/eapi | 1 +
.../default/linux/arm/17.0/armv4t/systemd/merged-usr/parent | 2 ++
profiles/default/linux/arm/17.0/armv5te/systemd/merged-usr/eapi | 1 +
.../default/linux/arm/17.0/armv5te/systemd/merged-usr/parent | 2 ++
profiles/default/linux/arm/17.0/armv6j/systemd/merged-usr/eapi | 1 +
.../default/linux/arm/17.0/armv6j/systemd/merged-usr/parent | 2 ++
.../linux/arm/17.0/armv7a/desktop/gnome/systemd/merged-usr/eapi | 1 +
.../arm/17.0/armv7a/desktop/gnome/systemd/merged-usr/parent | 2 ++
.../arm/17.0/armv7a/desktop/plasma/systemd/merged-usr/eapi | 1 +
.../arm/17.0/armv7a/desktop/plasma/systemd/merged-usr/parent | 2 ++
profiles/default/linux/arm/17.0/armv7a/systemd/merged-usr/eapi | 1 +
.../default/linux/arm/17.0/armv7a/systemd/merged-usr/parent | 2 ++
.../linux/arm/17.0/desktop/gnome/systemd/merged-usr/eapi | 1 +
.../linux/arm/17.0/desktop/gnome/systemd/merged-usr/parent | 2 ++
.../linux/arm/17.0/desktop/plasma/systemd/merged-usr/eapi | 1 +
.../linux/arm/17.0/desktop/plasma/systemd/merged-usr/parent | 2 ++
.../linux/arm64/17.0/desktop/gnome/systemd/merged-usr/eapi | 1 +
.../linux/arm64/17.0/desktop/gnome/systemd/merged-usr/parent | 2 ++
.../linux/arm64/17.0/desktop/plasma/systemd/merged-usr/eapi | 1 +
.../linux/arm64/17.0/desktop/plasma/systemd/merged-usr/parent | 2 ++
.../default/linux/arm64/17.0/desktop/systemd/merged-usr/eapi | 1 +
.../default/linux/arm64/17.0/desktop/systemd/merged-usr/parent | 2 ++
profiles/default/linux/arm64/17.0/systemd/merged-usr/eapi | 1 +
profiles/default/linux/arm64/17.0/systemd/merged-usr/parent | 2 ++
profiles/default/linux/hppa/17.0/systemd/merged-usr/eapi | 1 +
profiles/default/linux/hppa/17.0/systemd/merged-usr/parent | 2 ++
.../linux/ia64/17.0/desktop/gnome/systemd/merged-usr/eapi | 1 +
.../linux/ia64/17.0/desktop/gnome/systemd/merged-usr/parent | 2 ++
profiles/default/linux/ia64/17.0/systemd/merged-usr/eapi | 1 +
profiles/default/linux/ia64/17.0/systemd/merged-usr/parent | 2 ++
.../loong/22.0/la64v100/lp64d/desktop/systemd/merged-usr/eapi | 1 +
.../loong/22.0/la64v100/lp64d/desktop/systemd/merged-usr/parent | 2 ++
.../linux/loong/22.0/la64v100/lp64d/systemd/merged-usr/eapi | 1 +
.../linux/loong/22.0/la64v100/lp64d/systemd/merged-usr/parent | 2 ++
profiles/default/linux/m68k/17.0/systemd/merged-usr/eapi | 1 +
profiles/default/linux/m68k/17.0/systemd/merged-usr/parent | 2 ++
.../linux/mips/17.0/mipsel/multilib/n64/systemd/merged-usr/eapi | 1 +
.../mips/17.0/mipsel/multilib/n64/systemd/merged-usr/parent | 2 ++
.../default/linux/mips/17.0/mipsel/n64/systemd/merged-usr/eapi | 1 +
.../linux/mips/17.0/mipsel/n64/systemd/merged-usr/parent | 2 ++
.../powerpc/ppc32/17.0/desktop/gnome/systemd/merged-usr/eapi | 1 +
.../powerpc/ppc32/17.0/desktop/gnome/systemd/merged-usr/parent | 2 ++
.../17.0/32bit-userland/desktop/gnome/systemd/merged-usr/eapi | 1 +
.../17.0/32bit-userland/desktop/gnome/systemd/merged-usr/parent | 2 ++
.../17.0/64bit-userland/desktop/gnome/systemd/merged-usr/eapi | 1 +
.../17.0/64bit-userland/desktop/gnome/systemd/merged-usr/parent | 2 ++
.../linux/ppc/17.0/desktop/gnome/systemd/merged-usr/eapi | 1 +
.../linux/ppc/17.0/desktop/gnome/systemd/merged-usr/parent | 2 ++
profiles/default/linux/ppc/17.0/systemd/merged-usr/eapi | 1 +
profiles/default/linux/ppc/17.0/systemd/merged-usr/parent | 2 ++
.../linux/ppc64/17.0/desktop/gnome/systemd/merged-usr/eapi | 1 +
.../linux/ppc64/17.0/desktop/gnome/systemd/merged-usr/parent | 2 ++
profiles/default/linux/ppc64/17.0/systemd/merged-usr/eapi | 1 +
profiles/default/linux/ppc64/17.0/systemd/merged-usr/parent | 2 ++
.../linux/ppc64le/17.0/desktop/gnome/systemd/merged-usr/eapi | 1 +
.../linux/ppc64le/17.0/desktop/gnome/systemd/merged-usr/parent | 2 ++
.../linux/ppc64le/17.0/desktop/plasma/systemd/merged-usr/eapi | 1 +
.../linux/ppc64le/17.0/desktop/plasma/systemd/merged-usr/parent | 2 ++
profiles/default/linux/ppc64le/17.0/systemd/merged-usr/eapi | 1 +
profiles/default/linux/ppc64le/17.0/systemd/merged-usr/parent | 2 ++
.../20.0/rv64gc/lp64/desktop/gnome/systemd/merged-usr/eapi | 1 +
.../20.0/rv64gc/lp64/desktop/gnome/systemd/merged-usr/parent | 2 ++
.../20.0/rv64gc/lp64/desktop/plasma/systemd/merged-usr/eapi | 1 +
.../20.0/rv64gc/lp64/desktop/plasma/systemd/merged-usr/parent | 2 ++
.../riscv/20.0/rv64gc/lp64/desktop/systemd/merged-usr/eapi | 1 +
.../riscv/20.0/rv64gc/lp64/desktop/systemd/merged-usr/parent | 2 ++
.../linux/riscv/20.0/rv64gc/lp64/systemd/merged-usr/eapi | 1 +
.../linux/riscv/20.0/rv64gc/lp64/systemd/merged-usr/parent | 2 ++
.../20.0/rv64gc/lp64d/desktop/gnome/systemd/merged-usr/eapi | 1 +
.../20.0/rv64gc/lp64d/desktop/gnome/systemd/merged-usr/parent | 2 ++
.../20.0/rv64gc/lp64d/desktop/plasma/systemd/merged-usr/eapi | 1 +
.../20.0/rv64gc/lp64d/desktop/plasma/systemd/merged-usr/parent | 2 ++
.../riscv/20.0/rv64gc/lp64d/desktop/systemd/merged-usr/eapi | 1 +
.../riscv/20.0/rv64gc/lp64d/desktop/systemd/merged-usr/parent | 2 ++
.../linux/riscv/20.0/rv64gc/lp64d/systemd/merged-usr/eapi | 1 +
.../linux/riscv/20.0/rv64gc/lp64d/systemd/merged-usr/parent | 2 ++
.../linux/riscv/20.0/rv64gc/multilib/systemd/merged-usr/eapi | 1 +
.../linux/riscv/20.0/rv64gc/multilib/systemd/merged-usr/parent | 2 ++
profiles/default/linux/s390/17.0/s390x/systemd/merged-usr/eapi | 1 +
.../default/linux/s390/17.0/s390x/systemd/merged-usr/parent | 2 ++
profiles/default/linux/s390/17.0/systemd/merged-usr/eapi | 1 +
profiles/default/linux/s390/17.0/systemd/merged-usr/parent | 2 ++
profiles/default/linux/sparc/17.0/64ul/systemd/merged-usr/eapi | 1 +
.../default/linux/sparc/17.0/64ul/systemd/merged-usr/parent | 2 ++
profiles/default/linux/sparc/17.0/systemd/merged-usr/eapi | 1 +
profiles/default/linux/sparc/17.0/systemd/merged-usr/parent | 2 ++
.../linux/x86/17.0/desktop/gnome/systemd/merged-usr/eapi | 1 +
.../linux/x86/17.0/desktop/gnome/systemd/merged-usr/parent | 2 ++
.../linux/x86/17.0/desktop/plasma/systemd/merged-usr/eapi | 1 +
.../linux/x86/17.0/desktop/plasma/systemd/merged-usr/parent | 2 ++
profiles/default/linux/x86/17.0/systemd/merged-usr/eapi | 1 +
profiles/default/linux/x86/17.0/systemd/merged-usr/parent | 2 ++
106 files changed, 159 insertions(+)
create mode 100644 profiles/default/linux/alpha/17.0/desktop/gnome/systemd/merged-usr/eapi
create mode 100644 profiles/default/linux/alpha/17.0/desktop/gnome/systemd/merged-usr/parent
create mode 100644 profiles/default/linux/alpha/17.0/systemd/merged-usr/eapi
create mode 100644 profiles/default/linux/alpha/17.0/systemd/merged-usr/parent
create mode 100644 profiles/default/linux/amd64/17.1/desktop/gnome/systemd/merged-usr/eapi
create mode 100644 profiles/default/linux/amd64/17.1/desktop/gnome/systemd/merged-usr/parent
create mode 100644 profiles/default/linux/amd64/17.1/desktop/plasma/systemd/merged-usr/eapi
create mode 100644 profiles/default/linux/amd64/17.1/desktop/plasma/systemd/merged-usr/parent
create mode 100644 profiles/default/linux/amd64/17.1/desktop/systemd/merged-usr/eapi
create mode 100644 profiles/default/linux/amd64/17.1/desktop/systemd/merged-usr/parent
create mode 100644 profiles/default/linux/amd64/17.1/no-multilib/systemd/merged-usr/eapi
create mode 100644 profiles/default/linux/amd64/17.1/no-multilib/systemd/merged-usr/parent
create mode 100644 profiles/default/linux/amd64/17.1/systemd/merged-usr/eapi
create mode 100644 profiles/default/linux/amd64/17.1/systemd/merged-usr/parent
create mode 100644 profiles/default/linux/arm/17.0/armv4t/systemd/merged-usr/eapi
create mode 100644 profiles/default/linux/arm/17.0/armv4t/systemd/merged-usr/parent
create mode 100644 profiles/default/linux/arm/17.0/armv5te/systemd/merged-usr/eapi
create mode 100644 profiles/default/linux/arm/17.0/armv5te/systemd/merged-usr/parent
create mode 100644 profiles/default/linux/arm/17.0/armv6j/systemd/merged-usr/eapi
create mode 100644 profiles/default/linux/arm/17.0/armv6j/systemd/merged-usr/parent
create mode 100644 profiles/default/linux/arm/17.0/armv7a/desktop/gnome/systemd/merged-usr/eapi
create mode 100644 profiles/default/linux/arm/17.0/armv7a/desktop/gnome/systemd/merged-usr/parent
create mode 100644 profiles/default/linux/arm/17.0/armv7a/desktop/plasma/systemd/merged-usr/eapi
create mode 100644 profiles/default/linux/arm/17.0/armv7a/desktop/plasma/systemd/merged-usr/parent
create mode 100644 profiles/default/linux/arm/17.0/armv7a/systemd/merged-usr/eapi
create mode 100644 profiles/default/linux/arm/17.0/armv7a/systemd/merged-usr/parent
create mode 100644 profiles/default/linux/arm/17.0/desktop/gnome/systemd/merged-usr/eapi
create mode 100644 profiles/default/linux/arm/17.0/desktop/gnome/systemd/merged-usr/parent
create mode 100644 profiles/default/linux/arm/17.0/desktop/plasma/systemd/merged-usr/eapi
create mode 100644 profiles/default/linux/arm/17.0/desktop/plasma/systemd/merged-usr/parent
create mode 100644 profiles/default/linux/arm64/17.0/desktop/gnome/systemd/merged-usr/eapi
create mode 100644 profiles/default/linux/arm64/17.0/desktop/gnome/systemd/merged-usr/parent
create mode 100644 profiles/default/linux/arm64/17.0/desktop/plasma/systemd/merged-usr/eapi
create mode 100644 profiles/default/linux/arm64/17.0/desktop/plasma/systemd/merged-usr/parent
create mode 100644 profiles/default/linux/arm64/17.0/desktop/systemd/merged-usr/eapi
create mode 100644 profiles/default/linux/arm64/17.0/desktop/systemd/merged-usr/parent
create mode 100644 profiles/default/linux/arm64/17.0/systemd/merged-usr/eapi
create mode 100644 profiles/default/linux/arm64/17.0/systemd/merged-usr/parent
create mode 100644 profiles/default/linux/hppa/17.0/systemd/merged-usr/eapi
create mode 100644 profiles/default/linux/hppa/17.0/systemd/merged-usr/parent
create mode 100644 profiles/default/linux/ia64/17.0/desktop/gnome/systemd/merged-usr/eapi
create mode 100644 profiles/default/linux/ia64/17.0/desktop/gnome/systemd/merged-usr/parent
create mode 100644 profiles/default/linux/ia64/17.0/systemd/merged-usr/eapi
create mode 100644 profiles/default/linux/ia64/17.0/systemd/merged-usr/parent
create mode 100644 profiles/default/linux/loong/22.0/la64v100/lp64d/desktop/systemd/merged-usr/eapi
create mode 100644 profiles/default/linux/loong/22.0/la64v100/lp64d/desktop/systemd/merged-usr/parent
create mode 100644 profiles/default/linux/loong/22.0/la64v100/lp64d/systemd/merged-usr/eapi
create mode 100644 profiles/default/linux/loong/22.0/la64v100/lp64d/systemd/merged-usr/parent
create mode 100644 profiles/default/linux/m68k/17.0/systemd/merged-usr/eapi
create mode 100644 profiles/default/linux/m68k/17.0/systemd/merged-usr/parent
create mode 100644 profiles/default/linux/mips/17.0/mipsel/multilib/n64/systemd/merged-usr/eapi
create mode 100644 profiles/default/linux/mips/17.0/mipsel/multilib/n64/systemd/merged-usr/parent
create mode 100644 profiles/default/linux/mips/17.0/mipsel/n64/systemd/merged-usr/eapi
create mode 100644 profiles/default/linux/mips/17.0/mipsel/n64/systemd/merged-usr/parent
create mode 100644 profiles/default/linux/powerpc/ppc32/17.0/desktop/gnome/systemd/merged-usr/eapi
create mode 100644 profiles/default/linux/powerpc/ppc32/17.0/desktop/gnome/systemd/merged-usr/parent
create mode 100644 profiles/default/linux/powerpc/ppc64/17.0/32bit-userland/desktop/gnome/systemd/merged-usr/eapi
create mode 100644 profiles/default/linux/powerpc/ppc64/17.0/32bit-userland/desktop/gnome/systemd/merged-usr/parent
create mode 100644 profiles/default/linux/powerpc/ppc64/17.0/64bit-userland/desktop/gnome/systemd/merged-usr/eapi
create mode 100644 profiles/default/linux/powerpc/ppc64/17.0/64bit-userland/desktop/gnome/systemd/merged-usr/parent
create mode 100644 profiles/default/linux/ppc/17.0/desktop/gnome/systemd/merged-usr/eapi
create mode 100644 profiles/default/linux/ppc/17.0/desktop/gnome/systemd/merged-usr/parent
create mode 100644 profiles/default/linux/ppc/17.0/systemd/merged-usr/eapi
create mode 100644 profiles/default/linux/ppc/17.0/systemd/merged-usr/parent
create mode 100644 profiles/default/linux/ppc64/17.0/desktop/gnome/systemd/merged-usr/eapi
create mode 100644 profiles/default/linux/ppc64/17.0/desktop/gnome/systemd/merged-usr/parent
create mode 100644 profiles/default/linux/ppc64/17.0/systemd/merged-usr/eapi
create mode 100644 profiles/default/linux/ppc64/17.0/systemd/merged-usr/parent
create mode 100644 profiles/default/linux/ppc64le/17.0/desktop/gnome/systemd/merged-usr/eapi
create mode 100644 profiles/default/linux/ppc64le/17.0/desktop/gnome/systemd/merged-usr/parent
create mode 100644 profiles/default/linux/ppc64le/17.0/desktop/plasma/systemd/merged-usr/eapi
create mode 100644 profiles/default/linux/ppc64le/17.0/desktop/plasma/systemd/merged-usr/parent
create mode 100644 profiles/default/linux/ppc64le/17.0/systemd/merged-usr/eapi
create mode 100644 profiles/default/linux/ppc64le/17.0/systemd/merged-usr/parent
create mode 100644 profiles/default/linux/riscv/20.0/rv64gc/lp64/desktop/gnome/systemd/merged-usr/eapi
create mode 100644 profiles/default/linux/riscv/20.0/rv64gc/lp64/desktop/gnome/systemd/merged-usr/parent
create mode 100644 profiles/default/linux/riscv/20.0/rv64gc/lp64/desktop/plasma/systemd/merged-usr/eapi
create mode 100644 profiles/default/linux/riscv/20.0/rv64gc/lp64/desktop/plasma/systemd/merged-usr/parent
create mode 100644 profiles/default/linux/riscv/20.0/rv64gc/lp64/desktop/systemd/merged-usr/eapi
create mode 100644 profiles/default/linux/riscv/20.0/rv64gc/lp64/desktop/systemd/merged-usr/parent
create mode 100644 profiles/default/linux/riscv/20.0/rv64gc/lp64/systemd/merged-usr/eapi
create mode 100644 profiles/default/linux/riscv/20.0/rv64gc/lp64/systemd/merged-usr/parent
create mode 100644 profiles/default/linux/riscv/20.0/rv64gc/lp64d/desktop/gnome/systemd/merged-usr/eapi
create mode 100644 profiles/default/linux/riscv/20.0/rv64gc/lp64d/desktop/gnome/systemd/merged-usr/parent
create mode 100644 profiles/default/linux/riscv/20.0/rv64gc/lp64d/desktop/plasma/systemd/merged-usr/eapi
create mode 100644 profiles/default/linux/riscv/20.0/rv64gc/lp64d/desktop/plasma/systemd/merged-usr/parent
create mode 100644 profiles/default/linux/riscv/20.0/rv64gc/lp64d/desktop/systemd/merged-usr/eapi
create mode 100644 profiles/default/linux/riscv/20.0/rv64gc/lp64d/desktop/systemd/merged-usr/parent
create mode 100644 profiles/default/linux/riscv/20.0/rv64gc/lp64d/systemd/merged-usr/eapi
create mode 100644 profiles/default/linux/riscv/20.0/rv64gc/lp64d/systemd/merged-usr/parent
create mode 100644 profiles/default/linux/riscv/20.0/rv64gc/multilib/systemd/merged-usr/eapi
create mode 100644 profiles/default/linux/riscv/20.0/rv64gc/multilib/systemd/merged-usr/parent
create mode 100644 profiles/default/linux/s390/17.0/s390x/systemd/merged-usr/eapi
create mode 100644 profiles/default/linux/s390/17.0/s390x/systemd/merged-usr/parent
create mode 100644 profiles/default/linux/s390/17.0/systemd/merged-usr/eapi
create mode 100644 profiles/default/linux/s390/17.0/systemd/merged-usr/parent
create mode 100644 profiles/default/linux/sparc/17.0/64ul/systemd/merged-usr/eapi
create mode 100644 profiles/default/linux/sparc/17.0/64ul/systemd/merged-usr/parent
create mode 100644 profiles/default/linux/sparc/17.0/systemd/merged-usr/eapi
create mode 100644 profiles/default/linux/sparc/17.0/systemd/merged-usr/parent
create mode 100644 profiles/default/linux/x86/17.0/desktop/gnome/systemd/merged-usr/eapi
create mode 100644 profiles/default/linux/x86/17.0/desktop/gnome/systemd/merged-usr/parent
create mode 100644 profiles/default/linux/x86/17.0/desktop/plasma/systemd/merged-usr/eapi
create mode 100644 profiles/default/linux/x86/17.0/desktop/plasma/systemd/merged-usr/parent
create mode 100644 profiles/default/linux/x86/17.0/systemd/merged-usr/eapi
create mode 100644 profiles/default/linux/x86/17.0/systemd/merged-usr/parent

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
new file mode 100644
index 00000000000..7ed6ff82de6
--- /dev/null
+++ b/profiles/default/linux/alpha/17.0/desktop/gnome/systemd/merged-usr/eapi
@@ -0,0 +1 @@
+5
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
new file mode 100644
index 00000000000..1b7f7eef0a7
--- /dev/null
+++ b/profiles/default/linux/alpha/17.0/desktop/gnome/systemd/merged-usr/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../../../features/merged-usr
diff --git a/profiles/default/linux/alpha/17.0/systemd/merged-usr/eapi b/profiles/default/linux/alpha/17.0/systemd/merged-usr/eapi
new file mode 100644
index 00000000000..7ed6ff82de6
--- /dev/null
+++ b/profiles/default/linux/alpha/17.0/systemd/merged-usr/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/default/linux/alpha/17.0/systemd/merged-usr/parent b/profiles/default/linux/alpha/17.0/systemd/merged-usr/parent
new file mode 100644
index 00000000000..c407ca65bdc
--- /dev/null
+++ b/profiles/default/linux/alpha/17.0/systemd/merged-usr/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../features/merged-usr
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
new file mode 100644
index 00000000000..7ed6ff82de6
--- /dev/null
+++ b/profiles/default/linux/amd64/17.1/desktop/gnome/systemd/merged-usr/eapi
@@ -0,0 +1 @@
+5
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
new file mode 100644
index 00000000000..1b7f7eef0a7
--- /dev/null
+++ b/profiles/default/linux/amd64/17.1/desktop/gnome/systemd/merged-usr/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../../../features/merged-usr
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
new file mode 100644
index 00000000000..7ed6ff82de6
--- /dev/null
+++ b/profiles/default/linux/amd64/17.1/desktop/plasma/systemd/merged-usr/eapi
@@ -0,0 +1 @@
+5
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
new file mode 100644
index 00000000000..1b7f7eef0a7
--- /dev/null
+++ b/profiles/default/linux/amd64/17.1/desktop/plasma/systemd/merged-usr/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../../../features/merged-usr
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
new file mode 100644
index 00000000000..7ed6ff82de6
--- /dev/null
+++ b/profiles/default/linux/amd64/17.1/desktop/systemd/merged-usr/eapi
@@ -0,0 +1 @@
+5
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
new file mode 100644
index 00000000000..c8b1675247c
--- /dev/null
+++ b/profiles/default/linux/amd64/17.1/desktop/systemd/merged-usr/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../../features/merged-usr
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
new file mode 100644
index 00000000000..7ed6ff82de6
--- /dev/null
+++ b/profiles/default/linux/amd64/17.1/no-multilib/systemd/merged-usr/eapi
@@ -0,0 +1 @@
+5
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
new file mode 100644
index 00000000000..c8b1675247c
--- /dev/null
+++ b/profiles/default/linux/amd64/17.1/no-multilib/systemd/merged-usr/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../../features/merged-usr
diff --git a/profiles/default/linux/amd64/17.1/systemd/merged-usr/eapi b/profiles/default/linux/amd64/17.1/systemd/merged-usr/eapi
new file mode 100644
index 00000000000..7ed6ff82de6
--- /dev/null
+++ b/profiles/default/linux/amd64/17.1/systemd/merged-usr/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/default/linux/amd64/17.1/systemd/merged-usr/parent b/profiles/default/linux/amd64/17.1/systemd/merged-usr/parent
new file mode 100644
index 00000000000..c407ca65bdc
--- /dev/null
+++ b/profiles/default/linux/amd64/17.1/systemd/merged-usr/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../features/merged-usr
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
new file mode 100644
index 00000000000..7ed6ff82de6
--- /dev/null
+++ b/profiles/default/linux/arm/17.0/armv4t/systemd/merged-usr/eapi
@@ -0,0 +1 @@
+5
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
new file mode 100644
index 00000000000..c8b1675247c
--- /dev/null
+++ b/profiles/default/linux/arm/17.0/armv4t/systemd/merged-usr/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../../features/merged-usr
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
new file mode 100644
index 00000000000..7ed6ff82de6
--- /dev/null
+++ b/profiles/default/linux/arm/17.0/armv5te/systemd/merged-usr/eapi
@@ -0,0 +1 @@
+5
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
new file mode 100644
index 00000000000..c8b1675247c
--- /dev/null
+++ b/profiles/default/linux/arm/17.0/armv5te/systemd/merged-usr/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../../features/merged-usr
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
new file mode 100644
index 00000000000..7ed6ff82de6
--- /dev/null
+++ b/profiles/default/linux/arm/17.0/armv6j/systemd/merged-usr/eapi
@@ -0,0 +1 @@
+5
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
new file mode 100644
index 00000000000..c8b1675247c
--- /dev/null
+++ b/profiles/default/linux/arm/17.0/armv6j/systemd/merged-usr/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../../features/merged-usr
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
new file mode 100644
index 00000000000..7ed6ff82de6
--- /dev/null
+++ b/profiles/default/linux/arm/17.0/armv7a/desktop/gnome/systemd/merged-usr/eapi
@@ -0,0 +1 @@
+5
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
new file mode 100644
index 00000000000..5e9458ce54b
--- /dev/null
+++ b/profiles/default/linux/arm/17.0/armv7a/desktop/gnome/systemd/merged-usr/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../../../../features/merged-usr
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
new file mode 100644
index 00000000000..7ed6ff82de6
--- /dev/null
+++ b/profiles/default/linux/arm/17.0/armv7a/desktop/plasma/systemd/merged-usr/eapi
@@ -0,0 +1 @@
+5
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
new file mode 100644
index 00000000000..5e9458ce54b
--- /dev/null
+++ b/profiles/default/linux/arm/17.0/armv7a/desktop/plasma/systemd/merged-usr/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../../../../features/merged-usr
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
new file mode 100644
index 00000000000..7ed6ff82de6
--- /dev/null
+++ b/profiles/default/linux/arm/17.0/armv7a/systemd/merged-usr/eapi
@@ -0,0 +1 @@
+5
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
new file mode 100644
index 00000000000..c8b1675247c
--- /dev/null
+++ b/profiles/default/linux/arm/17.0/armv7a/systemd/merged-usr/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../../features/merged-usr
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
new file mode 100644
index 00000000000..7ed6ff82de6
--- /dev/null
+++ b/profiles/default/linux/arm/17.0/desktop/gnome/systemd/merged-usr/eapi
@@ -0,0 +1 @@
+5
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
new file mode 100644
index 00000000000..1b7f7eef0a7
--- /dev/null
+++ b/profiles/default/linux/arm/17.0/desktop/gnome/systemd/merged-usr/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../../../features/merged-usr
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
new file mode 100644
index 00000000000..7ed6ff82de6
--- /dev/null
+++ b/profiles/default/linux/arm/17.0/desktop/plasma/systemd/merged-usr/eapi
@@ -0,0 +1 @@
+5
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
new file mode 100644
index 00000000000..1b7f7eef0a7
--- /dev/null
+++ b/profiles/default/linux/arm/17.0/desktop/plasma/systemd/merged-usr/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../../../features/merged-usr
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
new file mode 100644
index 00000000000..7ed6ff82de6
--- /dev/null
+++ b/profiles/default/linux/arm64/17.0/desktop/gnome/systemd/merged-usr/eapi
@@ -0,0 +1 @@
+5
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
new file mode 100644
index 00000000000..1b7f7eef0a7
--- /dev/null
+++ b/profiles/default/linux/arm64/17.0/desktop/gnome/systemd/merged-usr/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../../../features/merged-usr
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
new file mode 100644
index 00000000000..7ed6ff82de6
--- /dev/null
+++ b/profiles/default/linux/arm64/17.0/desktop/plasma/systemd/merged-usr/eapi
@@ -0,0 +1 @@
+5
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
new file mode 100644
index 00000000000..1b7f7eef0a7
--- /dev/null
+++ b/profiles/default/linux/arm64/17.0/desktop/plasma/systemd/merged-usr/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../../../features/merged-usr
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
new file mode 100644
index 00000000000..7ed6ff82de6
--- /dev/null
+++ b/profiles/default/linux/arm64/17.0/desktop/systemd/merged-usr/eapi
@@ -0,0 +1 @@
+5
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
new file mode 100644
index 00000000000..c8b1675247c
--- /dev/null
+++ b/profiles/default/linux/arm64/17.0/desktop/systemd/merged-usr/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../../features/merged-usr
diff --git a/profiles/default/linux/arm64/17.0/systemd/merged-usr/eapi b/profiles/default/linux/arm64/17.0/systemd/merged-usr/eapi
new file mode 100644
index 00000000000..7ed6ff82de6
--- /dev/null
+++ b/profiles/default/linux/arm64/17.0/systemd/merged-usr/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/default/linux/arm64/17.0/systemd/merged-usr/parent b/profiles/default/linux/arm64/17.0/systemd/merged-usr/parent
new file mode 100644
index 00000000000..c407ca65bdc
--- /dev/null
+++ b/profiles/default/linux/arm64/17.0/systemd/merged-usr/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../features/merged-usr
diff --git a/profiles/default/linux/hppa/17.0/systemd/merged-usr/eapi b/profiles/default/linux/hppa/17.0/systemd/merged-usr/eapi
new file mode 100644
index 00000000000..7ed6ff82de6
--- /dev/null
+++ b/profiles/default/linux/hppa/17.0/systemd/merged-usr/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/default/linux/hppa/17.0/systemd/merged-usr/parent b/profiles/default/linux/hppa/17.0/systemd/merged-usr/parent
new file mode 100644
index 00000000000..c407ca65bdc
--- /dev/null
+++ b/profiles/default/linux/hppa/17.0/systemd/merged-usr/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../features/merged-usr
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
new file mode 100644
index 00000000000..7ed6ff82de6
--- /dev/null
+++ b/profiles/default/linux/ia64/17.0/desktop/gnome/systemd/merged-usr/eapi
@@ -0,0 +1 @@
+5
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
new file mode 100644
index 00000000000..1b7f7eef0a7
--- /dev/null
+++ b/profiles/default/linux/ia64/17.0/desktop/gnome/systemd/merged-usr/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../../../features/merged-usr
diff --git a/profiles/default/linux/ia64/17.0/systemd/merged-usr/eapi b/profiles/default/linux/ia64/17.0/systemd/merged-usr/eapi
new file mode 100644
index 00000000000..7ed6ff82de6
--- /dev/null
+++ b/profiles/default/linux/ia64/17.0/systemd/merged-usr/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/default/linux/ia64/17.0/systemd/merged-usr/parent b/profiles/default/linux/ia64/17.0/systemd/merged-usr/parent
new file mode 100644
index 00000000000..c407ca65bdc
--- /dev/null
+++ b/profiles/default/linux/ia64/17.0/systemd/merged-usr/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../features/merged-usr
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
new file mode 100644
index 00000000000..7ed6ff82de6
--- /dev/null
+++ b/profiles/default/linux/loong/22.0/la64v100/lp64d/desktop/systemd/merged-usr/eapi
@@ -0,0 +1 @@
+5
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
new file mode 100644
index 00000000000..5e9458ce54b
--- /dev/null
+++ b/profiles/default/linux/loong/22.0/la64v100/lp64d/desktop/systemd/merged-usr/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../../../../features/merged-usr
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
new file mode 100644
index 00000000000..7ed6ff82de6
--- /dev/null
+++ b/profiles/default/linux/loong/22.0/la64v100/lp64d/systemd/merged-usr/eapi
@@ -0,0 +1 @@
+5
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
new file mode 100644
index 00000000000..1b7f7eef0a7
--- /dev/null
+++ b/profiles/default/linux/loong/22.0/la64v100/lp64d/systemd/merged-usr/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../../../features/merged-usr
diff --git a/profiles/default/linux/m68k/17.0/systemd/merged-usr/eapi b/profiles/default/linux/m68k/17.0/systemd/merged-usr/eapi
new file mode 100644
index 00000000000..7ed6ff82de6
--- /dev/null
+++ b/profiles/default/linux/m68k/17.0/systemd/merged-usr/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/default/linux/m68k/17.0/systemd/merged-usr/parent b/profiles/default/linux/m68k/17.0/systemd/merged-usr/parent
new file mode 100644
index 00000000000..c407ca65bdc
--- /dev/null
+++ b/profiles/default/linux/m68k/17.0/systemd/merged-usr/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../features/merged-usr
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
new file mode 100644
index 00000000000..7ed6ff82de6
--- /dev/null
+++ b/profiles/default/linux/mips/17.0/mipsel/multilib/n64/systemd/merged-usr/eapi
@@ -0,0 +1 @@
+5
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
new file mode 100644
index 00000000000..5e9458ce54b
--- /dev/null
+++ b/profiles/default/linux/mips/17.0/mipsel/multilib/n64/systemd/merged-usr/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../../../../features/merged-usr
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
new file mode 100644
index 00000000000..7ed6ff82de6
--- /dev/null
+++ b/profiles/default/linux/mips/17.0/mipsel/n64/systemd/merged-usr/eapi
@@ -0,0 +1 @@
+5
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
new file mode 100644
index 00000000000..1b7f7eef0a7
--- /dev/null
+++ b/profiles/default/linux/mips/17.0/mipsel/n64/systemd/merged-usr/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../../../features/merged-usr
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
new file mode 100644
index 00000000000..7ed6ff82de6
--- /dev/null
+++ b/profiles/default/linux/powerpc/ppc32/17.0/desktop/gnome/systemd/merged-usr/eapi
@@ -0,0 +1 @@
+5
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
new file mode 100644
index 00000000000..5e9458ce54b
--- /dev/null
+++ b/profiles/default/linux/powerpc/ppc32/17.0/desktop/gnome/systemd/merged-usr/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../../../../features/merged-usr
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
new file mode 100644
index 00000000000..7ed6ff82de6
--- /dev/null
+++ b/profiles/default/linux/powerpc/ppc64/17.0/32bit-userland/desktop/gnome/systemd/merged-usr/eapi
@@ -0,0 +1 @@
+5
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
new file mode 100644
index 00000000000..05b6f4918b2
--- /dev/null
+++ b/profiles/default/linux/powerpc/ppc64/17.0/32bit-userland/desktop/gnome/systemd/merged-usr/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../../../../../features/merged-usr
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
new file mode 100644
index 00000000000..7ed6ff82de6
--- /dev/null
+++ b/profiles/default/linux/powerpc/ppc64/17.0/64bit-userland/desktop/gnome/systemd/merged-usr/eapi
@@ -0,0 +1 @@
+5
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
new file mode 100644
index 00000000000..05b6f4918b2
--- /dev/null
+++ b/profiles/default/linux/powerpc/ppc64/17.0/64bit-userland/desktop/gnome/systemd/merged-usr/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../../../../../features/merged-usr
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
new file mode 100644
index 00000000000..7ed6ff82de6
--- /dev/null
+++ b/profiles/default/linux/ppc/17.0/desktop/gnome/systemd/merged-usr/eapi
@@ -0,0 +1 @@
+5
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
new file mode 100644
index 00000000000..1b7f7eef0a7
--- /dev/null
+++ b/profiles/default/linux/ppc/17.0/desktop/gnome/systemd/merged-usr/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../../../features/merged-usr
diff --git a/profiles/default/linux/ppc/17.0/systemd/merged-usr/eapi b/profiles/default/linux/ppc/17.0/systemd/merged-usr/eapi
new file mode 100644
index 00000000000..7ed6ff82de6
--- /dev/null
+++ b/profiles/default/linux/ppc/17.0/systemd/merged-usr/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/default/linux/ppc/17.0/systemd/merged-usr/parent b/profiles/default/linux/ppc/17.0/systemd/merged-usr/parent
new file mode 100644
index 00000000000..c407ca65bdc
--- /dev/null
+++ b/profiles/default/linux/ppc/17.0/systemd/merged-usr/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../features/merged-usr
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
new file mode 100644
index 00000000000..7ed6ff82de6
--- /dev/null
+++ b/profiles/default/linux/ppc64/17.0/desktop/gnome/systemd/merged-usr/eapi
@@ -0,0 +1 @@
+5
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
new file mode 100644
index 00000000000..1b7f7eef0a7
--- /dev/null
+++ b/profiles/default/linux/ppc64/17.0/desktop/gnome/systemd/merged-usr/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../../../features/merged-usr
diff --git a/profiles/default/linux/ppc64/17.0/systemd/merged-usr/eapi b/profiles/default/linux/ppc64/17.0/systemd/merged-usr/eapi
new file mode 100644
index 00000000000..7ed6ff82de6
--- /dev/null
+++ b/profiles/default/linux/ppc64/17.0/systemd/merged-usr/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/default/linux/ppc64/17.0/systemd/merged-usr/parent b/profiles/default/linux/ppc64/17.0/systemd/merged-usr/parent
new file mode 100644
index 00000000000..c407ca65bdc
--- /dev/null
+++ b/profiles/default/linux/ppc64/17.0/systemd/merged-usr/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../features/merged-usr
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
new file mode 100644
index 00000000000..7ed6ff82de6
--- /dev/null
+++ b/profiles/default/linux/ppc64le/17.0/desktop/gnome/systemd/merged-usr/eapi
@@ -0,0 +1 @@
+5
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
new file mode 100644
index 00000000000..1b7f7eef0a7
--- /dev/null
+++ b/profiles/default/linux/ppc64le/17.0/desktop/gnome/systemd/merged-usr/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../../../features/merged-usr
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
new file mode 100644
index 00000000000..7ed6ff82de6
--- /dev/null
+++ b/profiles/default/linux/ppc64le/17.0/desktop/plasma/systemd/merged-usr/eapi
@@ -0,0 +1 @@
+5
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
new file mode 100644
index 00000000000..1b7f7eef0a7
--- /dev/null
+++ b/profiles/default/linux/ppc64le/17.0/desktop/plasma/systemd/merged-usr/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../../../features/merged-usr
diff --git a/profiles/default/linux/ppc64le/17.0/systemd/merged-usr/eapi b/profiles/default/linux/ppc64le/17.0/systemd/merged-usr/eapi
new file mode 100644
index 00000000000..7ed6ff82de6
--- /dev/null
+++ b/profiles/default/linux/ppc64le/17.0/systemd/merged-usr/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/default/linux/ppc64le/17.0/systemd/merged-usr/parent b/profiles/default/linux/ppc64le/17.0/systemd/merged-usr/parent
new file mode 100644
index 00000000000..c407ca65bdc
--- /dev/null
+++ b/profiles/default/linux/ppc64le/17.0/systemd/merged-usr/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../features/merged-usr
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
new file mode 100644
index 00000000000..7ed6ff82de6
--- /dev/null
+++ b/profiles/default/linux/riscv/20.0/rv64gc/lp64/desktop/gnome/systemd/merged-usr/eapi
@@ -0,0 +1 @@
+5
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
new file mode 100644
index 00000000000..05b6f4918b2
--- /dev/null
+++ b/profiles/default/linux/riscv/20.0/rv64gc/lp64/desktop/gnome/systemd/merged-usr/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../../../../../features/merged-usr
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
new file mode 100644
index 00000000000..7ed6ff82de6
--- /dev/null
+++ b/profiles/default/linux/riscv/20.0/rv64gc/lp64/desktop/plasma/systemd/merged-usr/eapi
@@ -0,0 +1 @@
+5
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
new file mode 100644
index 00000000000..05b6f4918b2
--- /dev/null
+++ b/profiles/default/linux/riscv/20.0/rv64gc/lp64/desktop/plasma/systemd/merged-usr/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../../../../../features/merged-usr
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
new file mode 100644
index 00000000000..7ed6ff82de6
--- /dev/null
+++ b/profiles/default/linux/riscv/20.0/rv64gc/lp64/desktop/systemd/merged-usr/eapi
@@ -0,0 +1 @@
+5
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
new file mode 100644
index 00000000000..5e9458ce54b
--- /dev/null
+++ b/profiles/default/linux/riscv/20.0/rv64gc/lp64/desktop/systemd/merged-usr/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../../../../features/merged-usr
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
new file mode 100644
index 00000000000..7ed6ff82de6
--- /dev/null
+++ b/profiles/default/linux/riscv/20.0/rv64gc/lp64/systemd/merged-usr/eapi
@@ -0,0 +1 @@
+5
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
new file mode 100644
index 00000000000..1b7f7eef0a7
--- /dev/null
+++ b/profiles/default/linux/riscv/20.0/rv64gc/lp64/systemd/merged-usr/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../../../features/merged-usr
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
new file mode 100644
index 00000000000..7ed6ff82de6
--- /dev/null
+++ b/profiles/default/linux/riscv/20.0/rv64gc/lp64d/desktop/gnome/systemd/merged-usr/eapi
@@ -0,0 +1 @@
+5
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
new file mode 100644
index 00000000000..05b6f4918b2
--- /dev/null
+++ b/profiles/default/linux/riscv/20.0/rv64gc/lp64d/desktop/gnome/systemd/merged-usr/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../../../../../features/merged-usr
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
new file mode 100644
index 00000000000..7ed6ff82de6
--- /dev/null
+++ b/profiles/default/linux/riscv/20.0/rv64gc/lp64d/desktop/plasma/systemd/merged-usr/eapi
@@ -0,0 +1 @@
+5
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
new file mode 100644
index 00000000000..05b6f4918b2
--- /dev/null
+++ b/profiles/default/linux/riscv/20.0/rv64gc/lp64d/desktop/plasma/systemd/merged-usr/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../../../../../features/merged-usr
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
new file mode 100644
index 00000000000..7ed6ff82de6
--- /dev/null
+++ b/profiles/default/linux/riscv/20.0/rv64gc/lp64d/desktop/systemd/merged-usr/eapi
@@ -0,0 +1 @@
+5
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
new file mode 100644
index 00000000000..5e9458ce54b
--- /dev/null
+++ b/profiles/default/linux/riscv/20.0/rv64gc/lp64d/desktop/systemd/merged-usr/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../../../../features/merged-usr
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
new file mode 100644
index 00000000000..7ed6ff82de6
--- /dev/null
+++ b/profiles/default/linux/riscv/20.0/rv64gc/lp64d/systemd/merged-usr/eapi
@@ -0,0 +1 @@
+5
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
new file mode 100644
index 00000000000..1b7f7eef0a7
--- /dev/null
+++ b/profiles/default/linux/riscv/20.0/rv64gc/lp64d/systemd/merged-usr/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../../../features/merged-usr
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
new file mode 100644
index 00000000000..7ed6ff82de6
--- /dev/null
+++ b/profiles/default/linux/riscv/20.0/rv64gc/multilib/systemd/merged-usr/eapi
@@ -0,0 +1 @@
+5
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
new file mode 100644
index 00000000000..1b7f7eef0a7
--- /dev/null
+++ b/profiles/default/linux/riscv/20.0/rv64gc/multilib/systemd/merged-usr/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../../../features/merged-usr
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
new file mode 100644
index 00000000000..7ed6ff82de6
--- /dev/null
+++ b/profiles/default/linux/s390/17.0/s390x/systemd/merged-usr/eapi
@@ -0,0 +1 @@
+5
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
new file mode 100644
index 00000000000..c8b1675247c
--- /dev/null
+++ b/profiles/default/linux/s390/17.0/s390x/systemd/merged-usr/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../../features/merged-usr
diff --git a/profiles/default/linux/s390/17.0/systemd/merged-usr/eapi b/profiles/default/linux/s390/17.0/systemd/merged-usr/eapi
new file mode 100644
index 00000000000..7ed6ff82de6
--- /dev/null
+++ b/profiles/default/linux/s390/17.0/systemd/merged-usr/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/default/linux/s390/17.0/systemd/merged-usr/parent b/profiles/default/linux/s390/17.0/systemd/merged-usr/parent
new file mode 100644
index 00000000000..c407ca65bdc
--- /dev/null
+++ b/profiles/default/linux/s390/17.0/systemd/merged-usr/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../features/merged-usr
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
new file mode 100644
index 00000000000..7ed6ff82de6
--- /dev/null
+++ b/profiles/default/linux/sparc/17.0/64ul/systemd/merged-usr/eapi
@@ -0,0 +1 @@
+5
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
new file mode 100644
index 00000000000..c8b1675247c
--- /dev/null
+++ b/profiles/default/linux/sparc/17.0/64ul/systemd/merged-usr/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../../features/merged-usr
diff --git a/profiles/default/linux/sparc/17.0/systemd/merged-usr/eapi b/profiles/default/linux/sparc/17.0/systemd/merged-usr/eapi
new file mode 100644
index 00000000000..7ed6ff82de6
--- /dev/null
+++ b/profiles/default/linux/sparc/17.0/systemd/merged-usr/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/default/linux/sparc/17.0/systemd/merged-usr/parent b/profiles/default/linux/sparc/17.0/systemd/merged-usr/parent
new file mode 100644
index 00000000000..c407ca65bdc
--- /dev/null
+++ b/profiles/default/linux/sparc/17.0/systemd/merged-usr/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../features/merged-usr
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
new file mode 100644
index 00000000000..7ed6ff82de6
--- /dev/null
+++ b/profiles/default/linux/x86/17.0/desktop/gnome/systemd/merged-usr/eapi
@@ -0,0 +1 @@
+5
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
new file mode 100644
index 00000000000..1b7f7eef0a7
--- /dev/null
+++ b/profiles/default/linux/x86/17.0/desktop/gnome/systemd/merged-usr/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../../../features/merged-usr
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
new file mode 100644
index 00000000000..7ed6ff82de6
--- /dev/null
+++ b/profiles/default/linux/x86/17.0/desktop/plasma/systemd/merged-usr/eapi
@@ -0,0 +1 @@
+5
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
new file mode 100644
index 00000000000..1b7f7eef0a7
--- /dev/null
+++ b/profiles/default/linux/x86/17.0/desktop/plasma/systemd/merged-usr/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../../../features/merged-usr
diff --git a/profiles/default/linux/x86/17.0/systemd/merged-usr/eapi b/profiles/default/linux/x86/17.0/systemd/merged-usr/eapi
new file mode 100644
index 00000000000..7ed6ff82de6
--- /dev/null
+++ b/profiles/default/linux/x86/17.0/systemd/merged-usr/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/default/linux/x86/17.0/systemd/merged-usr/parent b/profiles/default/linux/x86/17.0/systemd/merged-usr/parent
new file mode 100644
index 00000000000..c407ca65bdc
--- /dev/null
+++ b/profiles/default/linux/x86/17.0/systemd/merged-usr/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../features/merged-usr
--
2.37.2

[Mike Gilbert]

Signed-off-by: Mike Gilbert <flo...@gentoo.org>
---

profiles/profiles.desc | 288 ++++++++++++++++++++---------------------
1 file changed, 144 insertions(+), 144 deletions(-)

diff --git a/profiles/profiles.desc b/profiles/profiles.desc
index 4bc94f910ab..0a8a4d84bfb 100644
--- a/profiles/profiles.desc
+++ b/profiles/profiles.desc
@@ -7,47 +7,47 @@
# DO NOT ADD PROFILES WITH A "die" or "exit" IN THEM OR IT KILLS REPOMAN
#
#layout:
-#arch profile_directory status
+#arch profile_directory status

# Alpha Profiles
# @MAINTAINER: al...@gentoo.org
-alpha default/linux/alpha/17.0 exp
-alpha default/linux/alpha/17.0/systemd exp
+alpha default/linux/alpha/17.0 exp
+alpha default/linux/alpha/17.0/systemd exp
alpha default/linux/alpha/17.0/systemd/merged-usr exp
-alpha default/linux/alpha/17.0/desktop exp
-alpha default/linux/alpha/17.0/desktop/gnome exp
-alpha default/linux/alpha/17.0/desktop/gnome/systemd exp
+alpha default/linux/alpha/17.0/desktop exp
+alpha default/linux/alpha/17.0/desktop/gnome exp
+alpha default/linux/alpha/17.0/desktop/gnome/systemd exp
alpha default/linux/alpha/17.0/desktop/gnome/systemd/merged-usr exp
-alpha default/linux/alpha/17.0/developer exp
+alpha default/linux/alpha/17.0/developer exp

# SYMLINK_LIB=no profiles
# Run app-portage/unsymlink-lib *before* switching the profile.
# @MAINTAINER: mgo...@gentoo.org
-amd64 default/linux/amd64/17.1 stable
-amd64 default/linux/amd64/17.1/selinux stable
-amd64 default/linux/amd64/17.1/hardened stable
-amd64 default/linux/amd64/17.1/hardened/selinux stable
-amd64 default/linux/amd64/17.1/desktop stable
-amd64 default/linux/amd64/17.1/desktop/gnome stable
-amd64 default/linux/amd64/17.1/desktop/gnome/systemd stable
+amd64 default/linux/amd64/17.1 stable
+amd64 default/linux/amd64/17.1/selinux stable
+amd64 default/linux/amd64/17.1/hardened stable
+amd64 default/linux/amd64/17.1/hardened/selinux stable
+amd64 default/linux/amd64/17.1/desktop stable
+amd64 default/linux/amd64/17.1/desktop/gnome stable
+amd64 default/linux/amd64/17.1/desktop/gnome/systemd stable
amd64 default/linux/amd64/17.1/desktop/gnome/systemd/merged-usr dev
-amd64 default/linux/amd64/17.1/desktop/plasma stable
-amd64 default/linux/amd64/17.1/desktop/plasma/systemd stable
+amd64 default/linux/amd64/17.1/desktop/plasma stable
+amd64 default/linux/amd64/17.1/desktop/plasma/systemd stable
amd64 default/linux/amd64/17.1/desktop/plasma/systemd/merged-usr dev
-amd64 default/linux/amd64/17.1/desktop/systemd stable
+amd64 default/linux/amd64/17.1/desktop/systemd stable
amd64 default/linux/amd64/17.1/desktop/systemd/merged-usr dev
-amd64 default/linux/amd64/17.1/developer exp
-amd64 default/linux/amd64/17.1/no-multilib stable
-amd64 default/linux/amd64/17.1/no-multilib/hardened stable
-amd64 default/linux/amd64/17.1/no-multilib/hardened/selinux stable
-amd64 default/linux/amd64/17.1/no-multilib/systemd dev
+amd64 default/linux/amd64/17.1/developer exp
+amd64 default/linux/amd64/17.1/no-multilib stable
+amd64 default/linux/amd64/17.1/no-multilib/hardened stable
+amd64 default/linux/amd64/17.1/no-multilib/hardened/selinux stable
+amd64 default/linux/amd64/17.1/no-multilib/systemd dev
amd64 default/linux/amd64/17.1/no-multilib/systemd/merged-usr dev
-amd64 default/linux/amd64/17.1/no-multilib/systemd/selinux exp
-amd64 default/linux/amd64/17.1/systemd stable
+amd64 default/linux/amd64/17.1/no-multilib/systemd/selinux exp
+amd64 default/linux/amd64/17.1/systemd stable
amd64 default/linux/amd64/17.1/systemd/merged-usr dev
-amd64 default/linux/amd64/17.1/systemd/selinux exp
-amd64 default/linux/amd64/17.1/clang exp
-amd64 default/linux/amd64/17.1/systemd/clang exp
+amd64 default/linux/amd64/17.1/systemd/selinux exp
+amd64 default/linux/amd64/17.1/clang exp
+amd64 default/linux/amd64/17.1/systemd/clang exp

# AMD64 Profiles
# @MAINTAINER: am...@gentoo.org
@@ -69,77 +69,77 @@ amd64 default/linux/amd64/17.0/x32 dev

# ARM Profiles
# @MAINTAINER: a...@gentoo.org
-arm default/linux/arm/17.0 stable
-arm default/linux/arm/17.0/desktop dev
-arm default/linux/arm/17.0/desktop/gnome dev
-arm default/linux/arm/17.0/desktop/gnome/systemd dev
+arm default/linux/arm/17.0 stable
+arm default/linux/arm/17.0/desktop dev
+arm default/linux/arm/17.0/desktop/gnome dev
+arm default/linux/arm/17.0/desktop/gnome/systemd dev
arm default/linux/arm/17.0/desktop/gnome/systemd/merged-usr dev
-arm default/linux/arm/17.0/desktop/plasma dev
-arm default/linux/arm/17.0/desktop/plasma/systemd dev
+arm default/linux/arm/17.0/desktop/plasma dev
+arm default/linux/arm/17.0/desktop/plasma/systemd dev
arm default/linux/arm/17.0/desktop/plasma/systemd/merged-usr dev
-arm default/linux/arm/17.0/developer exp
-arm default/linux/arm/17.0/armv4 dev
-arm default/linux/arm/17.0/armv4/desktop dev
-arm default/linux/arm/17.0/armv4/desktop/gnome dev
-arm default/linux/arm/17.0/armv4/desktop/plasma dev
-arm default/linux/arm/17.0/armv4/developer exp
-arm default/linux/arm/17.0/armv4t dev
-arm default/linux/arm/17.0/armv4t/desktop dev
-arm default/linux/arm/17.0/armv4t/desktop/gnome dev
-arm default/linux/arm/17.0/armv4t/desktop/plasma dev
-arm default/linux/arm/17.0/armv4t/developer exp
-arm default/linux/arm/17.0/armv4t/systemd dev
+arm default/linux/arm/17.0/developer exp
+arm default/linux/arm/17.0/armv4 dev
+arm default/linux/arm/17.0/armv4/desktop dev
+arm default/linux/arm/17.0/armv4/desktop/gnome dev
+arm default/linux/arm/17.0/armv4/desktop/plasma dev
+arm default/linux/arm/17.0/armv4/developer exp
+arm default/linux/arm/17.0/armv4t dev
+arm default/linux/arm/17.0/armv4t/desktop dev
+arm default/linux/arm/17.0/armv4t/desktop/gnome dev
+arm default/linux/arm/17.0/armv4t/desktop/plasma dev
+arm default/linux/arm/17.0/armv4t/developer exp
+arm default/linux/arm/17.0/armv4t/systemd dev
arm default/linux/arm/17.0/armv4t/systemd/merged-usr dev
-arm default/linux/arm/17.0/armv5te dev
-arm default/linux/arm/17.0/armv5te/desktop dev
-arm default/linux/arm/17.0/armv5te/desktop/gnome dev
-arm default/linux/arm/17.0/armv5te/desktop/plasma dev
-arm default/linux/arm/17.0/armv5te/developer exp
-arm default/linux/arm/17.0/armv5te/systemd dev
+arm default/linux/arm/17.0/armv5te dev
+arm default/linux/arm/17.0/armv5te/desktop dev
+arm default/linux/arm/17.0/armv5te/desktop/gnome dev
+arm default/linux/arm/17.0/armv5te/desktop/plasma dev
+arm default/linux/arm/17.0/armv5te/developer exp
+arm default/linux/arm/17.0/armv5te/systemd dev
arm default/linux/arm/17.0/armv5te/systemd/merged-usr dev
-arm default/linux/arm/17.0/armv6j stable
-arm default/linux/arm/17.0/armv6j/hardened exp
-arm default/linux/arm/17.0/armv7a/hardened/selinux exp
-arm default/linux/arm/17.0/armv6j/desktop dev
-arm default/linux/arm/17.0/armv6j/desktop/gnome dev
-arm default/linux/arm/17.0/armv6j/desktop/plasma dev
-arm default/linux/arm/17.0/armv6j/developer exp
-arm default/linux/arm/17.0/armv6j/selinux exp
-arm default/linux/arm/17.0/armv6j/systemd dev
+arm default/linux/arm/17.0/armv6j stable
+arm default/linux/arm/17.0/armv6j/hardened exp
+arm default/linux/arm/17.0/armv7a/hardened/selinux exp
+arm default/linux/arm/17.0/armv6j/desktop dev
+arm default/linux/arm/17.0/armv6j/desktop/gnome dev
+arm default/linux/arm/17.0/armv6j/desktop/plasma dev
+arm default/linux/arm/17.0/armv6j/developer exp
+arm default/linux/arm/17.0/armv6j/selinux exp
+arm default/linux/arm/17.0/armv6j/systemd dev
arm default/linux/arm/17.0/armv6j/systemd/merged-usr dev
-arm default/linux/arm/17.0/armv7a stable
-arm default/linux/arm/17.0/armv7a/hardened exp
-arm default/linux/arm/17.0/armv7a/hardened/selinux dev
-arm default/linux/arm/17.0/armv7a/desktop dev
-arm default/linux/arm/17.0/armv7a/desktop/gnome dev
-arm default/linux/arm/17.0/armv7a/desktop/gnome/systemd dev
+arm default/linux/arm/17.0/armv7a stable
+arm default/linux/arm/17.0/armv7a/hardened exp
+arm default/linux/arm/17.0/armv7a/hardened/selinux dev
+arm default/linux/arm/17.0/armv7a/desktop dev
+arm default/linux/arm/17.0/armv7a/desktop/gnome dev
+arm default/linux/arm/17.0/armv7a/desktop/gnome/systemd dev
arm default/linux/arm/17.0/armv7a/desktop/gnome/systemd/merged-usr dev
-arm default/linux/arm/17.0/armv7a/desktop/plasma dev
-arm default/linux/arm/17.0/armv7a/desktop/plasma/systemd dev
+arm default/linux/arm/17.0/armv7a/desktop/plasma dev
+arm default/linux/arm/17.0/armv7a/desktop/plasma/systemd dev
arm default/linux/arm/17.0/armv7a/desktop/plasma/systemd/merged-usr dev
-arm default/linux/arm/17.0/armv7a/developer exp
-arm default/linux/arm/17.0/armv7a/systemd dev
+arm default/linux/arm/17.0/armv7a/developer exp
+arm default/linux/arm/17.0/armv7a/systemd dev
arm default/linux/arm/17.0/armv7a/systemd/merged-usr dev


# ARM64 Profiles
# @MAINTAINER: ar...@gentoo.org
-arm64 default/linux/arm64/17.0 stable
-arm64 default/linux/arm64/17.0/hardened exp
-arm64 default/linux/arm64/17.0/hardened/selinux dev
-arm64 default/linux/arm64/17.0/desktop stable
-arm64 default/linux/arm64/17.0/desktop/gnome stable
-arm64 default/linux/arm64/17.0/desktop/gnome/systemd stable
+arm64 default/linux/arm64/17.0 stable
+arm64 default/linux/arm64/17.0/hardened exp
+arm64 default/linux/arm64/17.0/hardened/selinux dev
+arm64 default/linux/arm64/17.0/desktop stable
+arm64 default/linux/arm64/17.0/desktop/gnome stable
+arm64 default/linux/arm64/17.0/desktop/gnome/systemd stable
arm64 default/linux/arm64/17.0/desktop/gnome/systemd/merged-usr dev
-arm64 default/linux/arm64/17.0/desktop/plasma stable
-arm64 default/linux/arm64/17.0/desktop/plasma/systemd stable
+arm64 default/linux/arm64/17.0/desktop/plasma stable
+arm64 default/linux/arm64/17.0/desktop/plasma/systemd stable
arm64 default/linux/arm64/17.0/desktop/plasma/systemd/merged-usr dev
-arm64 default/linux/arm64/17.0/desktop/systemd stable
+arm64 default/linux/arm64/17.0/desktop/systemd stable
arm64 default/linux/arm64/17.0/desktop/systemd/merged-usr dev
-arm64 default/linux/arm64/17.0/developer exp
-arm64 default/linux/arm64/17.0/systemd stable
+arm64 default/linux/arm64/17.0/developer exp
+arm64 default/linux/arm64/17.0/systemd stable
arm64 default/linux/arm64/17.0/systemd/merged-usr dev
-arm64 default/linux/arm64/17.0/systemd/selinux exp
+arm64 default/linux/arm64/17.0/systemd/selinux exp


# ARM64 Profiles (big-endian)
@@ -158,14 +158,14 @@ hppa default/linux/hppa/17.0/developer exp

# IA64 Profiles
# @MAINTAINER: ia...@gentoo.org
-ia64 default/linux/ia64/17.0 stable
-ia64 default/linux/ia64/17.0/desktop stable
-ia64 default/linux/ia64/17.0/desktop/gnome stable
-ia64 default/linux/ia64/17.0/desktop/gnome/systemd stable
+ia64 default/linux/ia64/17.0 stable
+ia64 default/linux/ia64/17.0/desktop stable
+ia64 default/linux/ia64/17.0/desktop/gnome stable
+ia64 default/linux/ia64/17.0/desktop/gnome/systemd stable
ia64 default/linux/ia64/17.0/desktop/gnome/systemd/merged-usr dev
-ia64 default/linux/ia64/17.0/developer exp
-ia64 default/linux/ia64/17.0/systemd exp
-ia64 default/linux/ia64/17.0/systemd/merged-usr exp
+ia64 default/linux/ia64/17.0/developer exp
+ia64 default/linux/ia64/17.0/systemd exp
+ia64 default/linux/ia64/17.0/systemd/merged-usr exp


# LoongArch Profiles
@@ -185,21 +185,21 @@ m68k default/linux/m68k/17.0/systemd/merged-usr exp

# MIPS Profiles
# @MAINTAINER: mi...@gentoo.org
-mips default/linux/mips/17.0/o32 exp
-mips default/linux/mips/17.0/n32 exp
-mips default/linux/mips/17.0/n64 exp
-mips default/linux/mips/17.0/multilib/o32 exp
-mips default/linux/mips/17.0/multilib/n32 exp
-mips default/linux/mips/17.0/multilib/n64 exp
-mips default/linux/mips/17.0/mipsel/o32 exp
-mips default/linux/mips/17.0/mipsel/n32 exp
-mips default/linux/mips/17.0/mipsel/n64 exp
-mips default/linux/mips/17.0/mipsel/n64/systemd exp
+mips default/linux/mips/17.0/o32 exp
+mips default/linux/mips/17.0/n32 exp
+mips default/linux/mips/17.0/n64 exp
+mips default/linux/mips/17.0/multilib/o32 exp
+mips default/linux/mips/17.0/multilib/n32 exp
+mips default/linux/mips/17.0/multilib/n64 exp
+mips default/linux/mips/17.0/mipsel/o32 exp
+mips default/linux/mips/17.0/mipsel/n32 exp
+mips default/linux/mips/17.0/mipsel/n64 exp
+mips default/linux/mips/17.0/mipsel/n64/systemd exp
mips default/linux/mips/17.0/mipsel/n64/systemd/merged-usr exp
-mips default/linux/mips/17.0/mipsel/multilib/o32 exp
-mips default/linux/mips/17.0/mipsel/multilib/n32 exp
-mips default/linux/mips/17.0/mipsel/multilib/n64 exp
-mips default/linux/mips/17.0/mipsel/multilib/n64/systemd exp
+mips default/linux/mips/17.0/mipsel/multilib/o32 exp
+mips default/linux/mips/17.0/mipsel/multilib/n32 exp
+mips default/linux/mips/17.0/mipsel/multilib/n64 exp
+mips default/linux/mips/17.0/mipsel/multilib/n64/systemd exp
mips default/linux/mips/17.0/mipsel/multilib/n64/systemd/merged-usr exp


@@ -239,32 +239,32 @@ ppc default/linux/ppc/17.0/musl/hardened exp

# PPC64 profiles
# @MAINTAINER: gyak...@gentoo.org, pp...@gentoo.org, mu...@gentoo.org
-ppc64 default/linux/ppc64/17.0 stable
-ppc64 default/linux/ppc64/17.0/desktop stable
-ppc64 default/linux/ppc64/17.0/desktop/gnome stable
-ppc64 default/linux/ppc64/17.0/desktop/gnome/systemd stable
+ppc64 default/linux/ppc64/17.0 stable
+ppc64 default/linux/ppc64/17.0/desktop stable
+ppc64 default/linux/ppc64/17.0/desktop/gnome stable
+ppc64 default/linux/ppc64/17.0/desktop/gnome/systemd stable
ppc64 default/linux/ppc64/17.0/desktop/gnome/systemd/merged-usr dev
-ppc64 default/linux/ppc64/17.0/systemd stable
+ppc64 default/linux/ppc64/17.0/systemd stable
ppc64 default/linux/ppc64/17.0/systemd/merged-usr dev
-ppc64 default/linux/ppc64/17.0/developer exp
-ppc64 default/linux/ppc64/17.0/musl exp
-ppc64 default/linux/ppc64/17.0/musl/hardened exp
+ppc64 default/linux/ppc64/17.0/developer exp
+ppc64 default/linux/ppc64/17.0/musl exp
+ppc64 default/linux/ppc64/17.0/musl/hardened exp

# PPC64LE profiles
# @MAINTAINER: gyak...@gentoo.org, pp...@gentoo.org, mu...@gentoo.org
-ppc64 default/linux/ppc64le/17.0 stable
-ppc64 default/linux/ppc64le/17.0/desktop stable
-ppc64 default/linux/ppc64le/17.0/desktop/gnome stable
-ppc64 default/linux/ppc64le/17.0/desktop/gnome/systemd stable
+ppc64 default/linux/ppc64le/17.0 stable
+ppc64 default/linux/ppc64le/17.0/desktop stable
+ppc64 default/linux/ppc64le/17.0/desktop/gnome stable
+ppc64 default/linux/ppc64le/17.0/desktop/gnome/systemd stable
ppc64 default/linux/ppc64le/17.0/desktop/gnome/systemd/merged-usr dev
-ppc64 default/linux/ppc64le/17.0/desktop/plasma stable
-ppc64 default/linux/ppc64le/17.0/desktop/plasma/systemd stable
+ppc64 default/linux/ppc64le/17.0/desktop/plasma stable
+ppc64 default/linux/ppc64le/17.0/desktop/plasma/systemd stable
ppc64 default/linux/ppc64le/17.0/desktop/plasma/systemd/merged-usr dev
-ppc64 default/linux/ppc64le/17.0/systemd stable
+ppc64 default/linux/ppc64le/17.0/systemd stable
ppc64 default/linux/ppc64le/17.0/systemd/merged-usr dev
-ppc64 default/linux/ppc64le/17.0/developer exp
-ppc64 default/linux/ppc64le/17.0/musl exp
-ppc64 default/linux/ppc64le/17.0/musl/hardened exp
+ppc64 default/linux/ppc64le/17.0/developer exp
+ppc64 default/linux/ppc64le/17.0/musl exp
+ppc64 default/linux/ppc64le/17.0/musl/hardened exp

# RISC-V Profiles
# @MAINTAINER: ri...@gentoo.org
@@ -298,41 +298,41 @@ riscv default/linux/riscv/20.0/rv64gc/multilib/systemd/merged-usr exp

# S390 Profiles
# @MAINTAINER: s3...@gentoo.org
-s390 default/linux/s390/17.0 stable
-s390 default/linux/s390/17.0/s390x stable
-s390 default/linux/s390/17.0/systemd stable
+s390 default/linux/s390/17.0 stable
+s390 default/linux/s390/17.0/s390x stable
+s390 default/linux/s390/17.0/systemd stable
s390 default/linux/s390/17.0/systemd/merged-usr dev
-s390 default/linux/s390/17.0/s390x/systemd exp
+s390 default/linux/s390/17.0/s390x/systemd exp
s390 default/linux/s390/17.0/s390x/systemd/merged-usr dev

# SPARC Profiles
# @MAINTAINER: sp...@gentoo.org
-sparc default/linux/sparc/17.0 stable
-sparc default/linux/sparc/17.0/desktop stable
-sparc default/linux/sparc/17.0/developer exp
-sparc default/linux/sparc/17.0/systemd stable
+sparc default/linux/sparc/17.0 stable
+sparc default/linux/sparc/17.0/desktop stable
+sparc default/linux/sparc/17.0/developer exp
+sparc default/linux/sparc/17.0/systemd stable
sparc default/linux/sparc/17.0/systemd/merged-usr dev
-sparc default/linux/sparc/17.0/64ul stable
-sparc default/linux/sparc/17.0/64ul/desktop stable
-sparc default/linux/sparc/17.0/64ul/developer exp
-sparc default/linux/sparc/17.0/64ul/systemd stable
+sparc default/linux/sparc/17.0/64ul stable
+sparc default/linux/sparc/17.0/64ul/desktop stable
+sparc default/linux/sparc/17.0/64ul/developer exp
+sparc default/linux/sparc/17.0/64ul/systemd stable
sparc default/linux/sparc/17.0/64ul/systemd/merged-usr dev

# x86 Profiles
# @MAINTAINER: x...@gentoo.org
-x86 default/linux/x86/17.0 stable
-x86 default/linux/x86/17.0/selinux stable
-x86 default/linux/x86/17.0/hardened stable
-x86 default/linux/x86/17.0/hardened/selinux stable
-x86 default/linux/x86/17.0/desktop stable
-x86 default/linux/x86/17.0/desktop/gnome stable
-x86 default/linux/x86/17.0/desktop/gnome/systemd stable
+x86 default/linux/x86/17.0 stable
+x86 default/linux/x86/17.0/selinux stable
+x86 default/linux/x86/17.0/hardened stable
+x86 default/linux/x86/17.0/hardened/selinux stable
+x86 default/linux/x86/17.0/desktop stable
+x86 default/linux/x86/17.0/desktop/gnome stable
+x86 default/linux/x86/17.0/desktop/gnome/systemd stable
x86 default/linux/x86/17.0/desktop/gnome/systemd/merged-usr dev
-x86 default/linux/x86/17.0/desktop/plasma stable
-x86 default/linux/x86/17.0/desktop/plasma/systemd stable
+x86 default/linux/x86/17.0/desktop/plasma stable
+x86 default/linux/x86/17.0/desktop/plasma/systemd stable
x86 default/linux/x86/17.0/desktop/plasma/systemd/merged-usr dev
-x86 default/linux/x86/17.0/developer exp
-x86 default/linux/x86/17.0/systemd stable
+x86 default/linux/x86/17.0/developer exp
+x86 default/linux/x86/17.0/systemd stable
x86 default/linux/x86/17.0/systemd/merged-usr dev

# musl profiles
--
2.37.2

[Mike Gilbert]

Signed-off-by: Mike Gilbert <flo...@gentoo.org>
---

profiles/features/merged-usr/eapi | 1 +
profiles/features/merged-usr/use.force | 1 +
profiles/features/merged-usr/use.mask | 1 +
3 files changed, 3 insertions(+)
create mode 100644 profiles/features/merged-usr/eapi
create mode 100644 profiles/features/merged-usr/use.force
create mode 100644 profiles/features/merged-usr/use.mask

diff --git a/profiles/features/merged-usr/eapi b/profiles/features/merged-usr/eapi

new file mode 100644
index 00000000000..7ed6ff82de6
--- /dev/null

+++ b/profiles/features/merged-usr/eapi

@@ -0,0 +1 @@
+5

diff --git a/profiles/features/merged-usr/use.force b/profiles/features/merged-usr/use.force
new file mode 100644
index 00000000000..115196048d6
--- /dev/null
+++ b/profiles/features/merged-usr/use.force
@@ -0,0 +1 @@
+-split-usr
diff --git a/profiles/features/merged-usr/use.mask b/profiles/features/merged-usr/use.mask
new file mode 100644
index 00000000000..a887bff5d14
--- /dev/null
+++ b/profiles/features/merged-usr/use.mask
@@ -0,0 +1 @@
+split-usr
--
2.37.2

[Jeff Gazso]

Just out of curiosity, how much pain is this likely to cause existing installations that will need to migrate from a split-usr setup to a merged-usr setup?

[Jaco Kroon]

Hi,

That really depends.

If the expectation is that everything in /usr/{bin,sbin,lib*} needs to now fit on / rather than /usr we're queued to re-install a very, very large number of hosts.

Kind Regards,
Jaco

[Mike Gilbert]

On Wed, Aug 31, 2022 at 12:01 PM Jeff Gazso <jeff....@gmail.com> wrote:
>
> Just out of curiosity, how much pain is this likely to cause existing installations that will need to migrate from a split-usr setup to a merged-usr setup?

We haven't deployed this to users, so feedback is limited thus far.

At least a handful of Gentoo devs have successfully migrated real
systems from split-usr to merged-usr without any major problems. It's
a relatively simple process: move the existing files (see
sys-apps/merge-usr), flip the split-usr USE flag off, and then run
"emege --update --deep --changed-use @world".

The only pain point I see is for users with /usr on a separate
filesystem and that are not using an appropriate initramfs. This has
been an "unsupported" configuration on Gentoo for several years, but
there are probably some users who do it anyway.

[Mike Gilbert]

On Wed, Aug 31, 2022 at 12:29 PM Jaco Kroon <ja...@uls.co.za> wrote:
>
> Hi,
>
> That really depends.
>
> If the expectation is that everything in /usr/{bin,sbin,lib*} needs to now fit on / rather than /usr we're queued to re-install a very, very large number of hosts.

You have that reversed: the expectation is that everything in
/{bin,sbin,lib} will fit in /usr. In other words, we move files from /
into /usr.

[Sam James]

> On 31 Aug 2022, at 17:29, Jaco Kroon <ja...@uls.co.za> wrote:
>
> Hi,
>
> That really depends.
>
> If the expectation is that everything in /usr/{bin,sbin,lib*} needs to now fit on / rather than /usr we're queued to re-install a very, very large number of hosts.

Of course, this is only for systemd users anyway. But see floppy's correction.

[Jaco Kroon]

Hi,

That's a relieve, but as per Sam this is only relevant to systemd
profiles, which for some reason I also completely overlooked as per the
subject.  However, these things do have a tendency to filter through to
non-systemd systems eventually.

Sorry for the noise.

Kind Regards,
Jaco

[Sam James]

> On 31 Aug 2022, at 21:36, Jaco Kroon <ja...@uls.co.za> wrote:
>
> Hi,
>
> On 2022/08/31 19:38, Mike Gilbert wrote:
>> On Wed, Aug 31, 2022 at 12:29 PM Jaco Kroon <ja...@uls.co.za> wrote:
>>> Hi,
>>>
>>> That really depends.
>>>
>>> If the expectation is that everything in /usr/{bin,sbin,lib*} needs to now fit on / rather than /usr we're queued to re-install a very, very large number of hosts.
>> You have that reversed: the expectation is that everything in
>> /{bin,sbin,lib} will fit in /usr. In other words, we move files from /
>> into /usr.
>
> That's a relieve, but as per Sam this is only relevant to systemd
> profiles, which for some reason I also completely overlooked as per the
> subject. However, these things do have a tendency to filter through to
> non-systemd systems eventually.

FWIW, our support (as you've sort of noticed before) for split-usr
(Which is related, but distinct, from non-merged -usr) is sort of tenuous
and while it's your right to do such installs, I'd consider at least
not installing new machines with such a configuration
as a way of very gradually phasing it out.

It's often a pain to handle properly. For example,
It's seemingly not possible to (easily, at least, and
portably) handle split-usr (separate /usr, as in
separate partition) in app-arch/zstd with pkg-config,
as pkg-config shouldn't point to the loader script,
but the real library [0].

As you can imagine, these complications together
with other, more pressing bugs, means it is at least
not very high on my list to look into such issues,
even though I do try when such bugs are within
my purview.

[0] https://github.com/trofi/nix-guix-gentoo/commit/8f194519982fbfabb6b3ca84c0806b1a379b5d06

best,
sam

[Marc Schiffbauer]

* Mike Gilbert schrieb am 01.09.22 um 03:38 Uhr:

So does this mean, that having /usr on a seperate filesystem remains
"supported" but is now only possible with a proper initrd?

-Marc

--
0x8201F9436611ABF9 - 41C5 71F2 0535 7D66 2E71
6DAA 8201 F943 6611 ABF9

[Mike Gilbert]

On Fri, Sep 2, 2022 at 9:01 AM Marc Schiffbauer <msc...@gentoo.org> wrote:
>
> * Mike Gilbert schrieb am 01.09.22 um 03:38 Uhr:
> > On Wed, Aug 31, 2022 at 12:29 PM Jaco Kroon <ja...@uls.co.za> wrote:
> > >
> > > Hi,
> > >
> > > That really depends.
> > >
> > > If the expectation is that everything in /usr/{bin,sbin,lib*} needs to now fit on / rather than /usr we're queued to re-install a very, very large number of hosts.
> >
> > You have that reversed: the expectation is that everything in
> > /{bin,sbin,lib} will fit in /usr. In other words, we move files from /
> > into /usr.
>
> So does this mean, that having /usr on a seperate filesystem remains
> "supported" but is now only possible with a proper initrd?

Switching to merged-usr does make it pretty much impossible to boot
without an initramfs if /usr is on a separate filesystem.

Having /usr on a separate filesystem without an initramfs to mount it
has been "unsupported" for several years; the council made a decision
on that in 2013 [1].

[1] https://projects.gentoo.org/council/meeting-logs/20130813-summary.txt

[Mike Gilbert]

To more directly answer your question: yes, having /usr on a separate
filesystem is still "supported" with an appropriate initramfs.

[Marc Schiffbauer]

* Mike Gilbert schrieb am 03.09.22 um 01:11 Uhr:

> To more directly answer your question: yes, having /usr on a separate
> filesystem is still "supported" with an appropriate initramfs.

Thanks, makes me sleep better ;)

Maybe this can be pointed out a bit more in the docs, to make this more
clear.

Thanks again

[Marek Szuba]

On 2022-08-31 17:27, Mike Gilbert wrote:

> The only pain point I see is for users with /usr on a separate
> filesystem and that are not using an appropriate initramfs.

As mentioned on IRC earlier on today, another (although this would be
less of a pain point and more of a sneaky changes to run-time behaviour
of a system) might be ebuilds which rely on PATH precedence of /usr/bin
over /bin to override binaries installed in the latter by other
packages. Some examples:

- app-arch/lbzip2[symlink] - installs /usr/bin/b{,un}zip2 to override
/bin/b{,un}zip2 installed by app-arch/bzip2;

- app-arch/pigz[symlink] - ditto for g{,un}zip and app-arch/gzip;

- app-arch/gzip installs the symlink /bin/uncompress pointing to
gunzip, app-arch/ncompress installs /usr/bin/uncompress pointing to
compress.

There probably are more though, and I feel these will all need a
systemic change - eselect modules? shell aliases? - to how such
overrides are handled. Still, for the time being packages which have
such behaviour controlled by USE flags should me added to
package.use.force of relevant profiles.

--
Marecki