commit: 730198c99dd7f387c553393169b017f25a10872f Author: Fabian Groffen <grobian <AT> gentoo <DOT> org> AuthorDate: Fri Dec 19 09:38:09 2025 +0000 Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org> CommitDate: Fri Dec 19 09:51:56 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=730198c9
profiles: drop *-linux keywords Prefix on Linux, either standalone or RAP will now share the keywords with regular Gentoo Linux (as RAP already did). The Prefix standalone profiles are not exposed at the moment in order to avoid users to switch to it. Closes: https://bugs.gentoo.org/473598 Closes: https://bugs.gentoo.org/720224 Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org> profiles/arch.list | 6 ------ profiles/arch/base/make.defaults | 2 +- profiles/arches.desc | 6 ------ profiles/embedded/make.defaults | 2 +- profiles/features/prefix/package.use.mask | 1 - profiles/prefix/linux/amd64/make.defaults | 7 +++---- profiles/prefix/linux/x86/make.defaults | 7 +++---- profiles/profiles.desc | 18 ++++++++---------- 8 files changed, 16 insertions(+), 33 deletions(-) diff --git a/profiles/arch.list b/profiles/arch.list index 24425027efa1..3f007da08d96 100644 --- a/profiles/arch.list +++ b/profiles/arch.list @@ -14,12 +14,6 @@ sparc x86 # Prefix keywords -amd64-linux -arm-linux -arm64-linux -ppc64-linux -riscv-linux -x86-linux arm64-macos x86-macos x64-macos diff --git a/profiles/arch/base/make.defaults b/profiles/arch/base/make.defaults index d396fc2a48a6..645bfc9d9932 100644 --- a/profiles/arch/base/make.defaults +++ b/profiles/arch/base/make.defaults @@ -3,6 +3,6 @@ USE_EXPAND_UNPREFIXED="ARCH" USE_EXPAND_IMPLICIT="ARCH" -USE_EXPAND_VALUES_ARCH="alpha amd64 amd64-linux arm arm64 arm64-macos hppa loong m68k mips ppc ppc64 ppc64-linux riscv s390 sparc x64-macos x64-solaris x86 x86-linux" +USE_EXPAND_VALUES_ARCH="alpha amd64 arm arm64 arm64-macos hppa loong m68k mips ppc ppc64 riscv s390 sparc x64-macos x64-solaris x86" PROFILE_ONLY_VARIABLES="${PROFILE_ONLY_VARIABLES} ARCH USE_EXPAND_VALUES_ARCH" diff --git a/profiles/arches.desc b/profiles/arches.desc index 029be0d7a9ee..46c7271c6fd8 100644 --- a/profiles/arches.desc +++ b/profiles/arches.desc @@ -27,12 +27,6 @@ sparc testing x86 stable # Prefix keywords -amd64-linux testing -arm-linux testing -arm64-linux testing -ppc64-linux testing -riscv-linux testing -x86-linux testing arm64-macos testing x86-macos testing x64-macos testing diff --git a/profiles/embedded/make.defaults b/profiles/embedded/make.defaults index 3517099f5f3a..57a195f033ff 100644 --- a/profiles/embedded/make.defaults +++ b/profiles/embedded/make.defaults @@ -22,7 +22,7 @@ LINGUAS="en" IUSE_IMPLICIT="prefix prefix-guest prefix-stack" USE_EXPAND_UNPREFIXED="ARCH" USE_EXPAND_IMPLICIT="ARCH ELIBC KERNEL" -USE_EXPAND_VALUES_ARCH="alpha amd64 amd64-linux arm arm64 hppa loong m68k mips ppc ppc64 ppc64-linux riscv s390 sparc x64-macos x64-solaris x86 x86-linux" +USE_EXPAND_VALUES_ARCH="alpha amd64 arm arm64 hppa loong m68k mips ppc ppc64 riscv s390 sparc x64-macos x64-solaris x86" USE_EXPAND_VALUES_ELIBC="bionic Darwin glibc mingw musl SunOS" # Note that we keep Winnt here for cross, especially for cmake.eclass (bug #910605) USE_EXPAND_VALUES_KERNEL="Darwin linux SunOS Winnt" diff --git a/profiles/features/prefix/package.use.mask b/profiles/features/prefix/package.use.mask index 12bba1c5f9e8..f82253cd0c2b 100644 --- a/profiles/features/prefix/package.use.mask +++ b/profiles/features/prefix/package.use.mask @@ -32,7 +32,6 @@ sys-devel/gcc vanilla # Rafael Goncalves Martins <[email protected]> (2010-09-29) # dev-libs/judy without prefix keywords -# (amd64-linux and x86-linux) sci-electronics/gtkwave judy # Christian Faulhammer <[email protected]> (2010-01-09) diff --git a/profiles/prefix/linux/amd64/make.defaults b/profiles/prefix/linux/amd64/make.defaults index f8433cd75e77..3f942efafc90 100644 --- a/profiles/prefix/linux/amd64/make.defaults +++ b/profiles/prefix/linux/amd64/make.defaults @@ -1,12 +1,11 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 #Note: this is Gentoo Prefix specific! (2008-07-13, darkside) # The base profile sets ACCEPT_KEYWORDS=amd64, add unstable on top of -# that, and retain historical Prefix-only amd64-linux keyword for a -# transition period, bug #473598. -ACCEPT_KEYWORDS="~amd64 ~amd64-linux" +# that to stay in line with the rest of Prefix +ACCEPT_KEYWORDS="~amd64" # We don't have lib64 or multilib in prefix, but single ABI, so remove it here. SYMLINK_LIB="" diff --git a/profiles/prefix/linux/x86/make.defaults b/profiles/prefix/linux/x86/make.defaults index 704bcb6ff405..38d5f4cf1edc 100644 --- a/profiles/prefix/linux/x86/make.defaults +++ b/profiles/prefix/linux/x86/make.defaults @@ -1,10 +1,9 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # The base profile sets ACCEPT_KEYWORDS=x86, add unstable on top of -# that, and retain historical prefix-only x86-linux keyword for -# transition period, bug #473598 -ACCEPT_KEYWORDS="~x86 ~x86-linux" +# that to stay in line with the rest of Prefix +ACCEPT_KEYWORDS="~x86" # in case we are bootstrapping with the host compiler on an amd64 linux host: CFLAGS="${CFLAGS} -m32" diff --git a/profiles/profiles.desc b/profiles/profiles.desc index 8dc165aec0a0..6d10bd442af7 100644 --- a/profiles/profiles.desc +++ b/profiles/profiles.desc @@ -524,16 +524,14 @@ x86 default/linux/x86/23.0/i486/split-usr/musl/selinux exp # These are Gentoo Prefix profiles, maintained by the Prefix team # @MAINTAINER: [email protected] -# Linux Profiles -amd64-linux prefix/linux/amd64 exp -arm-linux prefix/linux/arm exp -ppc64-linux prefix/linux/ppc64 exp -ppc64-linux prefix/linux/ppc64le exp -riscv-linux prefix/linux/riscv exp -x86-linux prefix/linux/x86 exp - -# Linux Standalone Profiles -# ?? +# Linux Profiles (non-RAP) +# commented out for now, for I don't want them to show up to users +#amd64 prefix/linux/amd64 exp +#arm prefix/linux/arm exp +#ppc64 prefix/linux/ppc64 exp +#ppc64 prefix/linux/ppc64le exp +#riscv prefix/linux/riscv exp +#x86 prefix/linux/x86 exp # macOS Profiles x64-macos prefix/darwin/macos/10.11/x64 exp
