profiles/default/linux/mips: reorganize for proper inheritance

musl profiles should be subprofiles of the corresponding non-musl
profiles, rather than top-level profiles below their relevant arch.
Otherwise inheritance is incorrect and results in overwriting
customizations from the musl feature profile.

Bug: https://bugs.gentoo.org/896096
Signed-off-by: Matoro Mahri <matoro@users.noreply.github.com>
Closes: https://github.com/gentoo/gentoo/pull/30049
Signed-off-by: Sam James <sam@gentoo.org>

43 files changed, 50 insertions, 54 deletions

diff --git a/profiles/default/linux/mips/17.0/musl/eapi b/profiles/default/linux/mips/17.0/mipsel/n64/musl/eapi
index 7ed6ff82de6b..7ed6ff82de6b 100644
--- a/profiles/default/linux/mips/17.0/musl/eapi
+++ b/profiles/default/linux/mips/17.0/mipsel/n64/musl/eapi
diff --git a/profiles/default/linux/mips/17.0/musl/mipsel/n64/make.defaults b/profiles/default/linux/mips/17.0/mipsel/n64/musl/make.defaults
index 26dbb0e4c1dc..cb0c7807a72f 100644
--- a/profiles/default/linux/mips/17.0/musl/mipsel/n64/make.defaults
+++ b/profiles/default/linux/mips/17.0/mipsel/n64/musl/make.defaults
@@ -1,6 +1,9 @@
-# Copyright 2022 Gentoo Authors
+# Copyright 2022-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 CHOST="mips64el-gentoo-linux-musl"
 CHOST_n64="${CHOST}"
 LIBDIR_n64="lib"
+
+# Disable sandbox because its currently broken on mipsel-musl
+FEATURES="-sandbox"
diff --git a/profiles/default/linux/mips/17.0/mipsel/n64/musl/parent b/profiles/default/linux/mips/17.0/mipsel/n64/musl/parent
new file mode 100644
index 000000000000..a3de2bcf95f7
--- /dev/null
+++ b/profiles/default/linux/mips/17.0/mipsel/n64/musl/parent
@@ -0,0 +1,3 @@
+..
+../../../../../../../features/musl
+../../../../../../../features/wd40
diff --git a/profiles/default/linux/mips/17.0/musl/mipsel/eapi b/profiles/default/linux/mips/17.0/mipsel/o32/musl/eapi
index 7ed6ff82de6b..7ed6ff82de6b 100644
--- a/profiles/default/linux/mips/17.0/musl/mipsel/eapi
+++ b/profiles/default/linux/mips/17.0/mipsel/o32/musl/eapi
diff --git a/profiles/default/linux/mips/17.0/musl/mipsel/make.defaults b/profiles/default/linux/mips/17.0/mipsel/o32/musl/make.defaults
index 53daa27ad9fb..d19638d73590 100644
--- a/profiles/default/linux/mips/17.0/musl/mipsel/make.defaults
+++ b/profiles/default/linux/mips/17.0/mipsel/o32/musl/make.defaults
@@ -1,5 +1,9 @@
-# Copyright 2022 Gentoo Authors
+# Copyright 2022-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+CHOST="mipsel-gentoo-linux-musl"
+CHOST_o32="${CHOST}"
+LIBDIR_o32="lib"
+
 # Disable sandbox because its currently broken on mipsel-musl
 FEATURES="-sandbox"
diff --git a/profiles/default/linux/mips/17.0/mipsel/o32/musl/parent b/profiles/default/linux/mips/17.0/mipsel/o32/musl/parent
new file mode 100644
index 000000000000..a3de2bcf95f7
--- /dev/null
+++ b/profiles/default/linux/mips/17.0/mipsel/o32/musl/parent
@@ -0,0 +1,3 @@
+..
+../../../../../../../features/musl
+../../../../../../../features/wd40
diff --git a/profiles/default/linux/mips/17.0/musl/mipsel/n64/parent b/profiles/default/linux/mips/17.0/musl/mipsel/n64/parent
deleted file mode 100644
index e92fcf7cbf75..000000000000
--- a/profiles/default/linux/mips/17.0/musl/mipsel/n64/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../../../arch/mips/mipsel/mips64el/n64
diff --git a/profiles/default/linux/mips/17.0/musl/mipsel/o32/make.defaults b/profiles/default/linux/mips/17.0/musl/mipsel/o32/make.defaults
deleted file mode 100644
index d0dec15ac7be..000000000000
--- a/profiles/default/linux/mips/17.0/musl/mipsel/o32/make.defaults
+++ /dev/null
@@ -1,6 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-CHOST="mipsel-gentoo-linux-musl"
-CHOST_o32="${CHOST}"
-LIBDIR_o32="lib"
diff --git a/profiles/default/linux/mips/17.0/musl/mipsel/o32/parent b/profiles/default/linux/mips/17.0/musl/mipsel/o32/parent
deleted file mode 100644
index 85db6caf16e5..000000000000
--- a/profiles/default/linux/mips/17.0/musl/mipsel/o32/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../../../arch/mips/mipsel/o32
diff --git a/profiles/default/linux/mips/17.0/musl/mipsel/parent b/profiles/default/linux/mips/17.0/musl/mipsel/parent
deleted file mode 100644
index f2bcf2737c18..000000000000
--- a/profiles/default/linux/mips/17.0/musl/mipsel/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../../arch/mips/mipsel
diff --git a/profiles/default/linux/mips/17.0/musl/n64/parent b/profiles/default/linux/mips/17.0/musl/n64/parent
deleted file mode 100644
index 0a2e2f270682..000000000000
--- a/profiles/default/linux/mips/17.0/musl/n64/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../../arch/mips/mips64/n64
diff --git a/profiles/default/linux/mips/17.0/musl/o32/parent b/profiles/default/linux/mips/17.0/musl/o32/parent
deleted file mode 100644
index 6d4edaa24a38..000000000000
--- a/profiles/default/linux/mips/17.0/musl/o32/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../../arch/mips/o32
diff --git a/profiles/default/linux/mips/17.0/musl/parent b/profiles/default/linux/mips/17.0/musl/parent
deleted file mode 100644
index 9ef7663a23b6..000000000000
--- a/profiles/default/linux/mips/17.0/musl/parent
+++ /dev/null
@@ -1,3 +0,0 @@
-..
-../../../../../features/musl
-../../../../../features/wd40
diff --git a/profiles/default/linux/mips/17.0/musl/mipsel/n64/eapi b/profiles/default/linux/mips/17.0/n64/musl/eapi
index 7ed6ff82de6b..7ed6ff82de6b 100644
--- a/profiles/default/linux/mips/17.0/musl/mipsel/n64/eapi
+++ b/profiles/default/linux/mips/17.0/n64/musl/eapi
diff --git a/profiles/default/linux/mips/17.0/musl/n64/make.defaults b/profiles/default/linux/mips/17.0/n64/musl/make.defaults
index 90dd88675350..594d429605ee 100644
--- a/profiles/default/linux/mips/17.0/musl/n64/make.defaults
+++ b/profiles/default/linux/mips/17.0/n64/musl/make.defaults
@@ -1,4 +1,4 @@
-# Copyright 2022 Gentoo Authors
+# Copyright 2022-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 CHOST="mips64-gentoo-linux-musl"
diff --git a/profiles/default/linux/mips/17.0/n64/musl/parent b/profiles/default/linux/mips/17.0/n64/musl/parent
new file mode 100644
index 000000000000..bd0ef6ecac62
--- /dev/null
+++ b/profiles/default/linux/mips/17.0/n64/musl/parent
@@ -0,0 +1,3 @@
+..
+../../../../../../features/musl
+../../../../../../features/wd40
diff --git a/profiles/default/linux/mips/17.0/musl/mipsel/o32/eapi b/profiles/default/linux/mips/17.0/o32/musl/eapi
index 7ed6ff82de6b..7ed6ff82de6b 100644
--- a/profiles/default/linux/mips/17.0/musl/mipsel/o32/eapi
+++ b/profiles/default/linux/mips/17.0/o32/musl/eapi
diff --git a/profiles/default/linux/mips/17.0/musl/o32/make.defaults b/profiles/default/linux/mips/17.0/o32/musl/make.defaults
index 4027a830450d..98209034fdbd 100644
--- a/profiles/default/linux/mips/17.0/musl/o32/make.defaults
+++ b/profiles/default/linux/mips/17.0/o32/musl/make.defaults
@@ -1,4 +1,4 @@
-# Copyright 2022 Gentoo Authors
+# Copyright 2022-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 CHOST="mips-gentoo-linux-musl"
diff --git a/profiles/default/linux/mips/17.0/o32/musl/parent b/profiles/default/linux/mips/17.0/o32/musl/parent
new file mode 100644
index 000000000000..bd0ef6ecac62
--- /dev/null
+++ b/profiles/default/linux/mips/17.0/o32/musl/parent
@@ -0,0 +1,3 @@
+..
+../../../../../../features/musl
+../../../../../../features/wd40
diff --git a/profiles/default/linux/mips/17.0/musl/n64/eapi b/profiles/default/linux/mips/23.0/mipsel/n64/musl/eapi
index 7ed6ff82de6b..7ed6ff82de6b 100644
--- a/profiles/default/linux/mips/17.0/musl/n64/eapi
+++ b/profiles/default/linux/mips/23.0/mipsel/n64/musl/eapi
diff --git a/profiles/default/linux/mips/23.0/musl/mipsel/n64/make.defaults b/profiles/default/linux/mips/23.0/mipsel/n64/musl/make.defaults
index 26dbb0e4c1dc..cb0c7807a72f 100644
--- a/profiles/default/linux/mips/23.0/musl/mipsel/n64/make.defaults
+++ b/profiles/default/linux/mips/23.0/mipsel/n64/musl/make.defaults
@@ -1,6 +1,9 @@
-# Copyright 2022 Gentoo Authors
+# Copyright 2022-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 CHOST="mips64el-gentoo-linux-musl"
 CHOST_n64="${CHOST}"
 LIBDIR_n64="lib"
+
+# Disable sandbox because its currently broken on mipsel-musl
+FEATURES="-sandbox"
diff --git a/profiles/default/linux/mips/23.0/mipsel/n64/musl/parent b/profiles/default/linux/mips/23.0/mipsel/n64/musl/parent
new file mode 100644
index 000000000000..a3de2bcf95f7
--- /dev/null
+++ b/profiles/default/linux/mips/23.0/mipsel/n64/musl/parent
@@ -0,0 +1,3 @@
+..
+../../../../../../../features/musl
+../../../../../../../features/wd40
diff --git a/profiles/default/linux/mips/17.0/musl/o32/eapi b/profiles/default/linux/mips/23.0/mipsel/o32/musl/eapi
index 7ed6ff82de6b..7ed6ff82de6b 100644
--- a/profiles/default/linux/mips/17.0/musl/o32/eapi
+++ b/profiles/default/linux/mips/23.0/mipsel/o32/musl/eapi
diff --git a/profiles/default/linux/mips/23.0/musl/mipsel/make.defaults b/profiles/default/linux/mips/23.0/mipsel/o32/musl/make.defaults
index 53daa27ad9fb..d19638d73590 100644
--- a/profiles/default/linux/mips/23.0/musl/mipsel/make.defaults
+++ b/profiles/default/linux/mips/23.0/mipsel/o32/musl/make.defaults
@@ -1,5 +1,9 @@
-# Copyright 2022 Gentoo Authors
+# Copyright 2022-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+CHOST="mipsel-gentoo-linux-musl"
+CHOST_o32="${CHOST}"
+LIBDIR_o32="lib"
+
 # Disable sandbox because its currently broken on mipsel-musl
 FEATURES="-sandbox"
diff --git a/profiles/default/linux/mips/23.0/mipsel/o32/musl/parent b/profiles/default/linux/mips/23.0/mipsel/o32/musl/parent
new file mode 100644
index 000000000000..a3de2bcf95f7
--- /dev/null
+++ b/profiles/default/linux/mips/23.0/mipsel/o32/musl/parent
@@ -0,0 +1,3 @@
+..
+../../../../../../../features/musl
+../../../../../../../features/wd40
diff --git a/profiles/default/linux/mips/23.0/musl/mipsel/n64/eapi b/profiles/default/linux/mips/23.0/musl/mipsel/n64/eapi
deleted file mode 100644
index 7ed6ff82de6b..000000000000
--- a/profiles/default/linux/mips/23.0/musl/mipsel/n64/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/profiles/default/linux/mips/23.0/musl/mipsel/n64/parent b/profiles/default/linux/mips/23.0/musl/mipsel/n64/parent
deleted file mode 100644
index e92fcf7cbf75..000000000000
--- a/profiles/default/linux/mips/23.0/musl/mipsel/n64/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../../../arch/mips/mipsel/mips64el/n64
diff --git a/profiles/default/linux/mips/23.0/musl/mipsel/o32/eapi b/profiles/default/linux/mips/23.0/musl/mipsel/o32/eapi
deleted file mode 100644
index 7ed6ff82de6b..000000000000
--- a/profiles/default/linux/mips/23.0/musl/mipsel/o32/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/profiles/default/linux/mips/23.0/musl/mipsel/o32/make.defaults b/profiles/default/linux/mips/23.0/musl/mipsel/o32/make.defaults
deleted file mode 100644
index d0dec15ac7be..000000000000
--- a/profiles/default/linux/mips/23.0/musl/mipsel/o32/make.defaults
+++ /dev/null
@@ -1,6 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-CHOST="mipsel-gentoo-linux-musl"
-CHOST_o32="${CHOST}"
-LIBDIR_o32="lib"
diff --git a/profiles/default/linux/mips/23.0/musl/mipsel/o32/parent b/profiles/default/linux/mips/23.0/musl/mipsel/o32/parent
deleted file mode 100644
index 85db6caf16e5..000000000000
--- a/profiles/default/linux/mips/23.0/musl/mipsel/o32/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../../../arch/mips/mipsel/o32
diff --git a/profiles/default/linux/mips/23.0/musl/mipsel/parent b/profiles/default/linux/mips/23.0/musl/mipsel/parent
deleted file mode 100644
index f2bcf2737c18..000000000000
--- a/profiles/default/linux/mips/23.0/musl/mipsel/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../../arch/mips/mipsel
diff --git a/profiles/default/linux/mips/23.0/musl/n64/eapi b/profiles/default/linux/mips/23.0/musl/n64/eapi
deleted file mode 100644
index 7ed6ff82de6b..000000000000
--- a/profiles/default/linux/mips/23.0/musl/n64/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/profiles/default/linux/mips/23.0/musl/n64/parent b/profiles/default/linux/mips/23.0/musl/n64/parent
deleted file mode 100644
index 0a2e2f270682..000000000000
--- a/profiles/default/linux/mips/23.0/musl/n64/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../../arch/mips/mips64/n64
diff --git a/profiles/default/linux/mips/23.0/musl/o32/eapi b/profiles/default/linux/mips/23.0/musl/o32/eapi
deleted file mode 100644
index 7ed6ff82de6b..000000000000
--- a/profiles/default/linux/mips/23.0/musl/o32/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/profiles/default/linux/mips/23.0/musl/o32/parent b/profiles/default/linux/mips/23.0/musl/o32/parent
deleted file mode 100644
index 6d4edaa24a38..000000000000
--- a/profiles/default/linux/mips/23.0/musl/o32/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../../arch/mips/o32
diff --git a/profiles/default/linux/mips/23.0/musl/parent b/profiles/default/linux/mips/23.0/musl/parent
deleted file mode 100644
index 9ef7663a23b6..000000000000
--- a/profiles/default/linux/mips/23.0/musl/parent
+++ /dev/null
@@ -1,3 +0,0 @@
-..
-../../../../../features/musl
-../../../../../features/wd40
diff --git a/profiles/default/linux/mips/23.0/musl/eapi b/profiles/default/linux/mips/23.0/n64/musl/eapi
index 7ed6ff82de6b..7ed6ff82de6b 100644
--- a/profiles/default/linux/mips/23.0/musl/eapi
+++ b/profiles/default/linux/mips/23.0/n64/musl/eapi
diff --git a/profiles/default/linux/mips/23.0/musl/n64/make.defaults b/profiles/default/linux/mips/23.0/n64/musl/make.defaults
index 90dd88675350..594d429605ee 100644
--- a/profiles/default/linux/mips/23.0/musl/n64/make.defaults
+++ b/profiles/default/linux/mips/23.0/n64/musl/make.defaults
@@ -1,4 +1,4 @@
-# Copyright 2022 Gentoo Authors
+# Copyright 2022-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 CHOST="mips64-gentoo-linux-musl"
diff --git a/profiles/default/linux/mips/23.0/n64/musl/parent b/profiles/default/linux/mips/23.0/n64/musl/parent
new file mode 100644
index 000000000000..bd0ef6ecac62
--- /dev/null
+++ b/profiles/default/linux/mips/23.0/n64/musl/parent
@@ -0,0 +1,3 @@
+..
+../../../../../../features/musl
+../../../../../../features/wd40
diff --git a/profiles/default/linux/mips/23.0/musl/mipsel/eapi b/profiles/default/linux/mips/23.0/o32/musl/eapi
index 7ed6ff82de6b..7ed6ff82de6b 100644
--- a/profiles/default/linux/mips/23.0/musl/mipsel/eapi
+++ b/profiles/default/linux/mips/23.0/o32/musl/eapi
diff --git a/profiles/default/linux/mips/23.0/musl/o32/make.defaults b/profiles/default/linux/mips/23.0/o32/musl/make.defaults
index 4027a830450d..98209034fdbd 100644
--- a/profiles/default/linux/mips/23.0/musl/o32/make.defaults
+++ b/profiles/default/linux/mips/23.0/o32/musl/make.defaults
@@ -1,4 +1,4 @@
-# Copyright 2022 Gentoo Authors
+# Copyright 2022-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 CHOST="mips-gentoo-linux-musl"
diff --git a/profiles/default/linux/mips/23.0/o32/musl/parent b/profiles/default/linux/mips/23.0/o32/musl/parent
new file mode 100644
index 000000000000..bd0ef6ecac62
--- /dev/null
+++ b/profiles/default/linux/mips/23.0/o32/musl/parent
@@ -0,0 +1,3 @@
+..
+../../../../../../features/musl
+../../../../../../features/wd40
diff --git a/profiles/profiles.desc b/profiles/profiles.desc
index 5845a27c356a..5907185b9e5a 100644
--- a/profiles/profiles.desc
+++ b/profiles/profiles.desc
@@ -351,10 +351,10 @@ arm64		default/linux/arm64/17.0/musl				dev
 arm64		default/linux/arm64/17.0/musl/llvm			exp
 arm64		default/linux/arm64/17.0/musl/hardened			exp
 arm64		default/linux/arm64/17.0/musl/hardened/selinux		exp
-mips		default/linux/mips/17.0/musl/o32			exp
-mips		default/linux/mips/17.0/musl/n64			exp
-mips		default/linux/mips/17.0/musl/mipsel/o32			exp
-mips		default/linux/mips/17.0/musl/mipsel/n64			exp
+mips		default/linux/mips/17.0/o32/musl			exp
+mips		default/linux/mips/17.0/n64/musl			exp
+mips		default/linux/mips/17.0/mipsel/o32/musl			exp
+mips		default/linux/mips/17.0/mipsel/n64/musl			exp
 riscv		default/linux/riscv/20.0/rv64gc/lp64d/musl		dev
 riscv		default/linux/riscv/20.0/rv64gc/lp64/musl		dev
 x86		default/linux/x86/17.0/musl				dev