profiles/profiles.desc: add systemd/merged-usr subprofiles

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

1 files changed, 54 insertions, 0 deletions

diff --git a/profiles/profiles.desc b/profiles/profiles.desc
index 894b0377d33e..4bc94f910aba 100644
--- a/profiles/profiles.desc
+++ b/profiles/profiles.desc
@@ -13,9 +13,11 @@
 # @MAINTAINER: alpha@gentoo.org
 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/gnome/systemd/merged-usr	exp
 alpha		default/linux/alpha/17.0/developer		exp
 
 # SYMLINK_LIB=no profiles
@@ -28,16 +30,21 @@ 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/systemd/merged-usr	dev
 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/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/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
@@ -66,8 +73,10 @@ 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/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
@@ -80,12 +89,14 @@ 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/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
@@ -95,16 +106,21 @@ 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/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/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/systemd/merged-usr		dev
+
 
 # ARM64 Profiles
 # @MAINTAINER: arm64@gentoo.org
@@ -114,13 +130,18 @@ 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/systemd/merged-usr	dev
 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/systemd/merged-usr			dev
 arm64		default/linux/arm64/17.0/systemd/selinux	exp
 
+
 # ARM64 Profiles (big-endian)
 # @MAINTAINER: steev@gentoo.org, slyfox@gentoo.org
 # big-endian profile intentionally does not contain all flavours
@@ -131,6 +152,7 @@ arm64		default/linux/arm64/17.0/big-endian		exp
 # @MAINTAINER: hppa@gentoo.org
 hppa		default/linux/hppa/17.0				stable
 hppa		default/linux/hppa/17.0/systemd			exp
+hppa		default/linux/hppa/17.0/systemd/merged-usr	dev
 hppa		default/linux/hppa/17.0/desktop			stable
 hppa		default/linux/hppa/17.0/developer		exp
 
@@ -140,20 +162,26 @@ 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
+
 
 # LoongArch Profiles
 # @MAINTAINER: loong@gentoo.org
 loong		default/linux/loong/22.0/la64v100/lp64d					exp
 loong		default/linux/loong/22.0/la64v100/lp64d/desktop				exp
 loong		default/linux/loong/22.0/la64v100/lp64d/desktop/systemd			exp
+loong		default/linux/loong/22.0/la64v100/lp64d/desktop/systemd/merged-usr	exp
 loong		default/linux/loong/22.0/la64v100/lp64d/systemd				exp
+loong		default/linux/loong/22.0/la64v100/lp64d/systemd/merged-usr		exp
 
 # M68K Profiles
 # @MAINTAINER: m68k@gentoo.org
 m68k		default/linux/m68k/17.0					exp
 m68k		default/linux/m68k/17.0/systemd				exp
+m68k		default/linux/m68k/17.0/systemd/merged-usr		exp
 
 # MIPS Profiles
 # @MAINTAINER: mips@gentoo.org
@@ -167,10 +195,13 @@ 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/n64/systemd/merged-usr	exp
+
 
 # Deprecated PPC32 Profiles
 # @MAINTAINER: ppc@gentoo.org
@@ -199,7 +230,9 @@ ppc		default/linux/ppc/17.0					stable
 ppc		default/linux/ppc/17.0/desktop				stable
 ppc		default/linux/ppc/17.0/desktop/gnome			stable
 ppc		default/linux/ppc/17.0/desktop/gnome/systemd		stable
+ppc		default/linux/ppc/17.0/desktop/gnome/systemd/merged-usr	dev
 ppc		default/linux/ppc/17.0/systemd				stable
+ppc		default/linux/ppc/17.0/systemd/merged-usr		dev
 ppc		default/linux/ppc/17.0/developer			exp
 ppc		default/linux/ppc/17.0/musl				exp
 ppc		default/linux/ppc/17.0/musl/hardened			exp
@@ -210,7 +243,9 @@ 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/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
@@ -221,9 +256,12 @@ 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/systemd/merged-usr	dev
 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
@@ -234,27 +272,38 @@ riscv		default/linux/riscv/20.0/rv64gc/lp64d					stable
 riscv		default/linux/riscv/20.0/rv64gc/lp64d/desktop				dev
 riscv		default/linux/riscv/20.0/rv64gc/lp64d/desktop/gnome			dev
 riscv		default/linux/riscv/20.0/rv64gc/lp64d/desktop/gnome/systemd		dev
+riscv		default/linux/riscv/20.0/rv64gc/lp64d/desktop/gnome/systemd/merged-usr	dev
 riscv		default/linux/riscv/20.0/rv64gc/lp64d/desktop/plasma			dev
 riscv		default/linux/riscv/20.0/rv64gc/lp64d/desktop/plasma/systemd		dev
+riscv		default/linux/riscv/20.0/rv64gc/lp64d/desktop/plasma/systemd/merged-usr	dev
 riscv		default/linux/riscv/20.0/rv64gc/lp64d/desktop/systemd			dev
+riscv		default/linux/riscv/20.0/rv64gc/lp64d/desktop/systemd/merged-usr	dev
 riscv		default/linux/riscv/20.0/rv64gc/lp64d/systemd				stable
+riscv		default/linux/riscv/20.0/rv64gc/lp64d/systemd/merged-usr		dev
 riscv		default/linux/riscv/20.0/rv64gc/lp64					stable
 riscv		default/linux/riscv/20.0/rv64gc/lp64/desktop				dev
 riscv		default/linux/riscv/20.0/rv64gc/lp64/desktop/gnome			dev
 riscv		default/linux/riscv/20.0/rv64gc/lp64/desktop/gnome/systemd		dev
+riscv		default/linux/riscv/20.0/rv64gc/lp64/desktop/gnome/systemd/merged-usr	dev
 riscv		default/linux/riscv/20.0/rv64gc/lp64/desktop/plasma			dev
 riscv		default/linux/riscv/20.0/rv64gc/lp64/desktop/plasma/systemd		dev
+riscv		default/linux/riscv/20.0/rv64gc/lp64/desktop/plasma/systemd/merged-usr	dev
 riscv		default/linux/riscv/20.0/rv64gc/lp64/desktop/systemd			dev
+riscv		default/linux/riscv/20.0/rv64gc/lp64/desktop/systemd/merged-usr		dev
 riscv		default/linux/riscv/20.0/rv64gc/lp64/systemd				stable
+riscv		default/linux/riscv/20.0/rv64gc/lp64/systemd/merged-usr			dev
 riscv		default/linux/riscv/20.0/rv64gc/multilib				exp
 riscv		default/linux/riscv/20.0/rv64gc/multilib/systemd			exp
+riscv		default/linux/riscv/20.0/rv64gc/multilib/systemd/merged-usr		exp
 
 # S390 Profiles
 # @MAINTAINER: s390@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/systemd/merged-usr		dev
 s390		default/linux/s390/17.0/s390x/systemd		exp
+s390		default/linux/s390/17.0/s390x/systemd/merged-usr	dev
 
 # SPARC Profiles
 # @MAINTAINER: sparc@gentoo.org
@@ -262,10 +311,12 @@ 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/systemd/merged-usr	dev
 
 # x86 Profiles
 # @MAINTAINER: x86@gentoo.org
@@ -276,10 +327,13 @@ 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/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/systemd/merged-usr			dev
 
 # musl profiles
 # @MAINTAINER: musl@gentoo.org