commit: 3f7de5bb536fa5fd4371f7ded88ef0924c17a31e Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org> AuthorDate: Tue Feb 13 19:05:47 2024 +0000 Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org> CommitDate: Tue Feb 13 19:08:28 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3f7de5bb
profiles: mips 23.0 split-usr musl: reorganize for proper inheritance This was done for the merged-usr profiles already, but the split-usr variants still had the broken layout... ] commit 711c0c802fda934c7b84f9ef274f320fc9edd273 ] Author: Matoro Mahri <matoro <AT> users.noreply.github.com> ] AuthorDate: Mon Mar 13 20:07:54 2023 -0400 ] Commit: Sam James <sam <AT> gentoo.org> ] CommitDate: Sun Mar 19 03:16:37 2023 +0000 ] ] 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. Fixes: 711c0c802fda934c7b84f9ef274f320fc9edd273 Bug: https://bugs.gentoo.org/896096 Bug: https://github.com/gentoo/gentoo/pull/30049 Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org> .../default/linux/mips/23.0/split-usr/{ => mipsel/n64}/musl/eapi | 0 .../split-usr/{musl/mipsel/n64 => mipsel/n64/musl}/make.defaults | 5 ++++- profiles/default/linux/mips/23.0/split-usr/mipsel/n64/musl/parent | 3 +++ .../linux/mips/23.0/split-usr/{musl/mipsel => mipsel/o32/musl}/eapi | 0 .../23.0/split-usr/{musl/mipsel => mipsel/o32/musl}/make.defaults | 6 +++++- profiles/default/linux/mips/23.0/split-usr/mipsel/o32/musl/parent | 3 +++ profiles/default/linux/mips/23.0/split-usr/musl/mipsel/n64/parent | 2 -- .../default/linux/mips/23.0/split-usr/musl/mipsel/o32/make.defaults | 6 ------ profiles/default/linux/mips/23.0/split-usr/musl/mipsel/o32/parent | 2 -- profiles/default/linux/mips/23.0/split-usr/musl/mipsel/parent | 2 -- profiles/default/linux/mips/23.0/split-usr/musl/n64/eapi | 1 - profiles/default/linux/mips/23.0/split-usr/musl/n64/parent | 2 -- profiles/default/linux/mips/23.0/split-usr/musl/o32/eapi | 1 - profiles/default/linux/mips/23.0/split-usr/musl/o32/parent | 2 -- profiles/default/linux/mips/23.0/split-usr/musl/parent | 3 --- .../linux/mips/23.0/split-usr/{musl/mipsel/n64 => n64/musl}/eapi | 0 .../linux/mips/23.0/split-usr/{musl/n64 => n64/musl}/make.defaults | 2 +- profiles/default/linux/mips/23.0/split-usr/n64/musl/parent | 3 +++ .../linux/mips/23.0/split-usr/{musl/mipsel/o32 => o32/musl}/eapi | 0 .../linux/mips/23.0/split-usr/{musl/o32 => o32/musl}/make.defaults | 2 +- profiles/default/linux/mips/23.0/split-usr/o32/musl/parent | 3 +++ 21 files changed, 23 insertions(+), 25 deletions(-) diff --git a/profiles/default/linux/mips/23.0/split-usr/musl/eapi b/profiles/default/linux/mips/23.0/split-usr/mipsel/n64/musl/eapi similarity index 100% rename from profiles/default/linux/mips/23.0/split-usr/musl/eapi rename to profiles/default/linux/mips/23.0/split-usr/mipsel/n64/musl/eapi diff --git a/profiles/default/linux/mips/23.0/split-usr/musl/mipsel/n64/make.defaults b/profiles/default/linux/mips/23.0/split-usr/mipsel/n64/musl/make.defaults similarity index 54% rename from profiles/default/linux/mips/23.0/split-usr/musl/mipsel/n64/make.defaults rename to profiles/default/linux/mips/23.0/split-usr/mipsel/n64/musl/make.defaults index a03fe9087268..2e59fcee2315 100644 --- a/profiles/default/linux/mips/23.0/split-usr/musl/mipsel/n64/make.defaults +++ b/profiles/default/linux/mips/23.0/split-usr/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-unknown-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/split-usr/mipsel/n64/musl/parent b/profiles/default/linux/mips/23.0/split-usr/mipsel/n64/musl/parent new file mode 100644 index 000000000000..43b77c652c58 --- /dev/null +++ b/profiles/default/linux/mips/23.0/split-usr/mipsel/n64/musl/parent @@ -0,0 +1,3 @@ +.. +../../../../../../../../features/musl +../../../../../../../../features/wd40 diff --git a/profiles/default/linux/mips/23.0/split-usr/musl/mipsel/eapi b/profiles/default/linux/mips/23.0/split-usr/mipsel/o32/musl/eapi similarity index 100% rename from profiles/default/linux/mips/23.0/split-usr/musl/mipsel/eapi rename to profiles/default/linux/mips/23.0/split-usr/mipsel/o32/musl/eapi diff --git a/profiles/default/linux/mips/23.0/split-usr/musl/mipsel/make.defaults b/profiles/default/linux/mips/23.0/split-usr/mipsel/o32/musl/make.defaults similarity index 57% rename from profiles/default/linux/mips/23.0/split-usr/musl/mipsel/make.defaults rename to profiles/default/linux/mips/23.0/split-usr/mipsel/o32/musl/make.defaults index 53daa27ad9fb..a27d20f7e941 100644 --- a/profiles/default/linux/mips/23.0/split-usr/musl/mipsel/make.defaults +++ b/profiles/default/linux/mips/23.0/split-usr/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-unknown-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/split-usr/mipsel/o32/musl/parent b/profiles/default/linux/mips/23.0/split-usr/mipsel/o32/musl/parent new file mode 100644 index 000000000000..43b77c652c58 --- /dev/null +++ b/profiles/default/linux/mips/23.0/split-usr/mipsel/o32/musl/parent @@ -0,0 +1,3 @@ +.. +../../../../../../../../features/musl +../../../../../../../../features/wd40 diff --git a/profiles/default/linux/mips/23.0/split-usr/musl/mipsel/n64/parent b/profiles/default/linux/mips/23.0/split-usr/musl/mipsel/n64/parent deleted file mode 100644 index 7ddcaf7ebefb..000000000000 --- a/profiles/default/linux/mips/23.0/split-usr/musl/mipsel/n64/parent +++ /dev/null @@ -1,2 +0,0 @@ -.. -../../../../../../../../arch/mips/mipsel/mips64el/n64 diff --git a/profiles/default/linux/mips/23.0/split-usr/musl/mipsel/o32/make.defaults b/profiles/default/linux/mips/23.0/split-usr/musl/mipsel/o32/make.defaults deleted file mode 100644 index a47110341849..000000000000 --- a/profiles/default/linux/mips/23.0/split-usr/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-unknown-linux-musl" -CHOST_o32="${CHOST}" -LIBDIR_o32="lib" diff --git a/profiles/default/linux/mips/23.0/split-usr/musl/mipsel/o32/parent b/profiles/default/linux/mips/23.0/split-usr/musl/mipsel/o32/parent deleted file mode 100644 index e0296df48f7b..000000000000 --- a/profiles/default/linux/mips/23.0/split-usr/musl/mipsel/o32/parent +++ /dev/null @@ -1,2 +0,0 @@ -.. -../../../../../../../../arch/mips/mipsel/o32 diff --git a/profiles/default/linux/mips/23.0/split-usr/musl/mipsel/parent b/profiles/default/linux/mips/23.0/split-usr/musl/mipsel/parent deleted file mode 100644 index 06ca5406ea73..000000000000 --- a/profiles/default/linux/mips/23.0/split-usr/musl/mipsel/parent +++ /dev/null @@ -1,2 +0,0 @@ -.. -../../../../../../../arch/mips/mipsel diff --git a/profiles/default/linux/mips/23.0/split-usr/musl/n64/eapi b/profiles/default/linux/mips/23.0/split-usr/musl/n64/eapi deleted file mode 100644 index 7ed6ff82de6b..000000000000 --- a/profiles/default/linux/mips/23.0/split-usr/musl/n64/eapi +++ /dev/null @@ -1 +0,0 @@ -5 diff --git a/profiles/default/linux/mips/23.0/split-usr/musl/n64/parent b/profiles/default/linux/mips/23.0/split-usr/musl/n64/parent deleted file mode 100644 index 1490152882c9..000000000000 --- a/profiles/default/linux/mips/23.0/split-usr/musl/n64/parent +++ /dev/null @@ -1,2 +0,0 @@ -.. -../../../../../../../arch/mips/mips64/n64 diff --git a/profiles/default/linux/mips/23.0/split-usr/musl/o32/eapi b/profiles/default/linux/mips/23.0/split-usr/musl/o32/eapi deleted file mode 100644 index 7ed6ff82de6b..000000000000 --- a/profiles/default/linux/mips/23.0/split-usr/musl/o32/eapi +++ /dev/null @@ -1 +0,0 @@ -5 diff --git a/profiles/default/linux/mips/23.0/split-usr/musl/o32/parent b/profiles/default/linux/mips/23.0/split-usr/musl/o32/parent deleted file mode 100644 index 4c02cb42398d..000000000000 --- a/profiles/default/linux/mips/23.0/split-usr/musl/o32/parent +++ /dev/null @@ -1,2 +0,0 @@ -.. -../../../../../../../arch/mips/o32 diff --git a/profiles/default/linux/mips/23.0/split-usr/musl/parent b/profiles/default/linux/mips/23.0/split-usr/musl/parent deleted file mode 100644 index bd0ef6ecac62..000000000000 --- a/profiles/default/linux/mips/23.0/split-usr/musl/parent +++ /dev/null @@ -1,3 +0,0 @@ -.. -../../../../../../features/musl -../../../../../../features/wd40 diff --git a/profiles/default/linux/mips/23.0/split-usr/musl/mipsel/n64/eapi b/profiles/default/linux/mips/23.0/split-usr/n64/musl/eapi similarity index 100% rename from profiles/default/linux/mips/23.0/split-usr/musl/mipsel/n64/eapi rename to profiles/default/linux/mips/23.0/split-usr/n64/musl/eapi diff --git a/profiles/default/linux/mips/23.0/split-usr/musl/n64/make.defaults b/profiles/default/linux/mips/23.0/split-usr/n64/musl/make.defaults similarity index 79% rename from profiles/default/linux/mips/23.0/split-usr/musl/n64/make.defaults rename to profiles/default/linux/mips/23.0/split-usr/n64/musl/make.defaults index 3aa37470dc52..7d44ab8f14cb 100644 --- a/profiles/default/linux/mips/23.0/split-usr/musl/n64/make.defaults +++ b/profiles/default/linux/mips/23.0/split-usr/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-unknown-linux-musl" diff --git a/profiles/default/linux/mips/23.0/split-usr/n64/musl/parent b/profiles/default/linux/mips/23.0/split-usr/n64/musl/parent new file mode 100644 index 000000000000..a3de2bcf95f7 --- /dev/null +++ b/profiles/default/linux/mips/23.0/split-usr/n64/musl/parent @@ -0,0 +1,3 @@ +.. +../../../../../../../features/musl +../../../../../../../features/wd40 diff --git a/profiles/default/linux/mips/23.0/split-usr/musl/mipsel/o32/eapi b/profiles/default/linux/mips/23.0/split-usr/o32/musl/eapi similarity index 100% rename from profiles/default/linux/mips/23.0/split-usr/musl/mipsel/o32/eapi rename to profiles/default/linux/mips/23.0/split-usr/o32/musl/eapi diff --git a/profiles/default/linux/mips/23.0/split-usr/musl/o32/make.defaults b/profiles/default/linux/mips/23.0/split-usr/o32/musl/make.defaults similarity index 78% rename from profiles/default/linux/mips/23.0/split-usr/musl/o32/make.defaults rename to profiles/default/linux/mips/23.0/split-usr/o32/musl/make.defaults index 60751683766b..dd6d00ffcba1 100644 --- a/profiles/default/linux/mips/23.0/split-usr/musl/o32/make.defaults +++ b/profiles/default/linux/mips/23.0/split-usr/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-unknown-linux-musl" diff --git a/profiles/default/linux/mips/23.0/split-usr/o32/musl/parent b/profiles/default/linux/mips/23.0/split-usr/o32/musl/parent new file mode 100644 index 000000000000..a3de2bcf95f7 --- /dev/null +++ b/profiles/default/linux/mips/23.0/split-usr/o32/musl/parent @@ -0,0 +1,3 @@ +.. +../../../../../../../features/musl +../../../../../../../features/wd40
