[gentoo-commits] repo/gentoo:master commit in: profiles/default/linux/powerpc/ppc32/17.0/musl/hardened/, ...

[gentoo-commits] repo/gentoo:master commit in: profiles/default/linux/powerpc/ppc32/17.0/musl/hardened/, ...

[Sam James]

commit:     1c9dcdba33971e9b3f9037f1979f3798d736ab80
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 19 17:35:49 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Mar 19 17:36:26 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1c9dcdba

profiles/default/linux: drop trailing slash from musl inherit in 'parent' file

We keep seeing reports of collisions between musl/glibc but this shouldn't
be possible as glibc is masked on musl profiles.

Not clear if this is causing our issue but it's at the very least superfluous
and maybe even wrong.

Bug: https://bugs.gentoo.org/831063
Bug: https://bugs.gentoo.org/834579
Bug: https://bugs.gentoo.org/631568
Bug: https://bugs.gentoo.org/611094
Signed-off-by: Sam James <sam <AT> gentoo.org>

 profiles/default/linux/amd64/17.0/musl/parent                  | 2 +-
 profiles/default/linux/arm/17.0/musl/parent                    | 2 +-
 profiles/default/linux/arm64/17.0/musl/parent                  | 2 +-
 profiles/default/linux/powerpc/ppc32/17.0/musl/hardened/parent | 2 +-
 profiles/default/linux/powerpc/ppc32/17.0/musl/parent          | 2 +-
 profiles/default/linux/riscv/20.0/rv64gc/lp64d/musl/parent     | 2 +-
 profiles/default/linux/x86/17.0/musl/parent                    | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/profiles/default/linux/amd64/17.0/musl/parent b/profiles/default/linux/amd64/17.0/musl/parent
index 8b660ec6dcac..0e86ace1a74b 100644
--- a/profiles/default/linux/amd64/17.0/musl/parent
+++ b/profiles/default/linux/amd64/17.0/musl/parent
@@ -1,3 +1,3 @@
 ..
 ../../../../../arch/amd64/no-multilib
-../../../../../features/musl/
+../../../../../features/musl

diff --git a/profiles/default/linux/arm/17.0/musl/parent b/profiles/default/linux/arm/17.0/musl/parent
index f381f1758c6e..468c1fa0a937 100644
--- a/profiles/default/linux/arm/17.0/musl/parent
+++ b/profiles/default/linux/arm/17.0/musl/parent
@@ -1,3 +1,3 @@
 ..
 ../../../../../arch/arm
-../../../../../features/musl/
+../../../../../features/musl

diff --git a/profiles/default/linux/arm64/17.0/musl/parent b/profiles/default/linux/arm64/17.0/musl/parent
index a340ae545671..58651906cb67 100644
--- a/profiles/default/linux/arm64/17.0/musl/parent
+++ b/profiles/default/linux/arm64/17.0/musl/parent
@@ -1,2 +1,2 @@
 ..
-../../../../../features/musl/
+../../../../../features/musl

diff --git a/profiles/default/linux/powerpc/ppc32/17.0/musl/hardened/parent b/profiles/default/linux/powerpc/ppc32/17.0/musl/hardened/parent
index 289590637db8..b488e1ca01b8 100644
--- a/profiles/default/linux/powerpc/ppc32/17.0/musl/hardened/parent
+++ b/profiles/default/linux/powerpc/ppc32/17.0/musl/hardened/parent
@@ -1,2 +1,2 @@
 ..
-../../../../../../../features/musl/
+../../../../../../../features/musl

diff --git a/profiles/default/linux/powerpc/ppc32/17.0/musl/parent b/profiles/default/linux/powerpc/ppc32/17.0/musl/parent
index defd8fa55b6d..c6f6f61d6366 100644
--- a/profiles/default/linux/powerpc/ppc32/17.0/musl/parent
+++ b/profiles/default/linux/powerpc/ppc32/17.0/musl/parent
@@ -1,3 +1,3 @@
 ..
 ../../../../../../arch/powerpc/ppc32
-../../../../../../features/musl/
+../../../../../../features/musl

diff --git a/profiles/default/linux/riscv/20.0/rv64gc/lp64d/musl/parent b/profiles/default/linux/riscv/20.0/rv64gc/lp64d/musl/parent
index 289590637db8..b488e1ca01b8 100644
--- a/profiles/default/linux/riscv/20.0/rv64gc/lp64d/musl/parent
+++ b/profiles/default/linux/riscv/20.0/rv64gc/lp64d/musl/parent
@@ -1,2 +1,2 @@
 ..
-../../../../../../../features/musl/
+../../../../../../../features/musl

diff --git a/profiles/default/linux/x86/17.0/musl/parent b/profiles/default/linux/x86/17.0/musl/parent
index a340ae545671..58651906cb67 100644
--- a/profiles/default/linux/x86/17.0/musl/parent
+++ b/profiles/default/linux/x86/17.0/musl/parent
@@ -1,2 +1,2 @@
 ..
-../../../../../features/musl/
+../../../../../features/musl