From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 4569F15808B for ; Sat, 19 Mar 2022 17:39:16 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 78823E0955; Sat, 19 Mar 2022 17:39:15 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id A056CE0955 for ; Sat, 19 Mar 2022 17:39:14 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 6AF74343218 for ; Sat, 19 Mar 2022 17:39:12 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 02EC430C for ; Sat, 19 Mar 2022 17:39:11 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1647711386.1c9dcdba33971e9b3f9037f1979f3798d736ab80.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: profiles/default/linux/powerpc/ppc32/17.0/musl/hardened/, ... X-VCS-Repository: repo/gentoo X-VCS-Files: profiles/default/linux/amd64/17.0/musl/parent profiles/default/linux/arm/17.0/musl/parent profiles/default/linux/arm64/17.0/musl/parent profiles/default/linux/powerpc/ppc32/17.0/musl/hardened/parent profiles/default/linux/powerpc/ppc32/17.0/musl/parent profiles/default/linux/riscv/20.0/rv64gc/lp64d/musl/parent profiles/default/linux/x86/17.0/musl/parent X-VCS-Directories: profiles/default/linux/arm64/17.0/musl/ profiles/default/linux/x86/17.0/musl/ profiles/default/linux/riscv/20.0/rv64gc/lp64d/musl/ profiles/default/linux/arm/17.0/musl/ profiles/default/linux/amd64/17.0/musl/ profiles/default/linux/powerpc/ppc32/17.0/musl/ profiles/default/linux/powerpc/ppc32/17.0/musl/hardened/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 1c9dcdba33971e9b3f9037f1979f3798d736ab80 X-VCS-Branch: master Date: Sat, 19 Mar 2022 17:39:11 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 001b136e-8377-4a41-a6ee-cf6b6df9dfb4 X-Archives-Hash: bd5fa7053d90c63ae6daf31003a4a2da commit: 1c9dcdba33971e9b3f9037f1979f3798d736ab80 Author: Sam James gentoo org> AuthorDate: Sat Mar 19 17:35:49 2022 +0000 Commit: Sam James gentoo 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 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