commit: 05be364e1dcbf04a23b5ecf54b6bfae0f39f5cf0 Author: David Seifert <soap <AT> gentoo <DOT> org> AuthorDate: Tue May 16 21:11:23 2023 +0000 Commit: David Seifert <soap <AT> gentoo <DOT> org> CommitDate: Tue May 16 21:11:23 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=05be364e
profiles: remove dead implicit userland_* flags Closes: https://github.com/gentoo/gentoo/pull/31034 Signed-off-by: David Seifert <soap <AT> gentoo.org> profiles/base/make.defaults | 10 ++++------ profiles/base/use.force | 5 ++--- profiles/base/use.mask | 3 --- profiles/desc/userland.desc | 9 --------- profiles/embedded/make.defaults | 12 +++++------- profiles/embedded/use.force | 1 - profiles/features/prefix/make.defaults | 6 +----- profiles/features/prefix/use.force | 5 +---- profiles/features/prefix/use.mask | 5 +---- profiles/prefix/use.force | 4 ++-- 10 files changed, 16 insertions(+), 44 deletions(-) diff --git a/profiles/base/make.defaults b/profiles/base/make.defaults index 65b8149ada84..f227acf07c58 100644 --- a/profiles/base/make.defaults +++ b/profiles/base/make.defaults @@ -6,18 +6,17 @@ # Profile IUSE injection (applies only to ebuilds which use EAPI 5 or later) IUSE_IMPLICIT="prefix prefix-guest prefix-stack" -USE_EXPAND_IMPLICIT="ELIBC KERNEL USERLAND" +USE_EXPAND_IMPLICIT="ELIBC KERNEL" USE_EXPAND_VALUES_ELIBC="bionic Cygwin Darwin glibc mingw musl SunOS Winnt" USE_EXPAND_VALUES_KERNEL="Darwin linux SunOS Winnt" -USE_EXPAND_VALUES_USERLAND="BSD GNU" # Env vars to expand into USE vars. Modifying this requires prior # discussion on gentoo-...@lists.gentoo.org. -USE_EXPAND="ABI_MIPS ABI_S390 ABI_X86 ADA_TARGET ALSA_CARDS AMDGPU_TARGETS APACHE2_MODULES APACHE2_MPMS CALLIGRA_FEATURES CAMERAS COLLECTD_PLUGINS CPU_FLAGS_ARM CPU_FLAGS_PPC CPU_FLAGS_X86 CURL_SSL ELIBC FFTOOLS GPSD_PROTOCOLS GRUB_PLATFORMS INPUT_DEVICES KERNEL L10N LCD_DEVICES LIBREOFFICE_EXTENSIONS LLVM_TARGETS LUA_SINGLE_TARGET LUA_TARGETS MONKEYD_PLUGINS NGINX_MODULES_HTTP NGINX_MODULES_MAIL NGINX_MODULES_STREAM OFFICE_IMPLEMENTATION OPENMPI_FABRICS OPENMPI_OFED_FEATURES OPENMPI_RM PHP_TARGETS POSTGRES_TARGETS PYTHON_SINGLE_TARGET PYTHON_TARGETS QEMU_SOFTMMU_TARGETS QEMU_USER_TARGETS ROS_MESSAGES RUBY_TARGETS SANE_BACKENDS USERLAND UWSGI_PLUGINS VIDEO_CARDS VOICEMAIL_STORAGE XTABLES_ADDONS" +USE_EXPAND="ABI_MIPS ABI_S390 ABI_X86 ADA_TARGET ALSA_CARDS AMDGPU_TARGETS APACHE2_MODULES APACHE2_MPMS CALLIGRA_FEATURES CAMERAS COLLECTD_PLUGINS CPU_FLAGS_ARM CPU_FLAGS_PPC CPU_FLAGS_X86 CURL_SSL ELIBC FFTOOLS GPSD_PROTOCOLS GRUB_PLATFORMS INPUT_DEVICES KERNEL L10N LCD_DEVICES LIBREOFFICE_EXTENSIONS LLVM_TARGETS LUA_SINGLE_TARGET LUA_TARGETS MONKEYD_PLUGINS NGINX_MODULES_HTTP NGINX_MODULES_MAIL NGINX_MODULES_STREAM OFFICE_IMPLEMENTATION OPENMPI_FABRICS OPENMPI_OFED_FEATURES OPENMPI_RM PHP_TARGETS POSTGRES_TARGETS PYTHON_SINGLE_TARGET PYTHON_TARGETS QEMU_SOFTMMU_TARGETS QEMU_USER_TARGETS ROS_MESSAGES RUBY_TARGETS SANE_BACKENDS UWSGI_PLUGINS VIDEO_CARDS VOICEMAIL_STORAGE XTABLES_ADDONS" # USE_EXPAND variables whose contents are not shown in package manager # output. Changes need discussion on gentoo-dev. -USE_EXPAND_HIDDEN="USERLAND KERNEL ELIBC ABI_MIPS ABI_S390 ABI_X86 CPU_FLAGS_ARM CPU_FLAGS_PPC CPU_FLAGS_X86" +USE_EXPAND_HIDDEN="KERNEL ELIBC ABI_MIPS ABI_S390 ABI_X86 CPU_FLAGS_ARM CPU_FLAGS_PPC CPU_FLAGS_X86" CONFIG_PROTECT="/etc" CONFIG_PROTECT_MASK="/etc/env.d /etc/gconf" @@ -47,12 +46,11 @@ ENV_UNSET="DBUS_SESSION_BUS_ADDRESS DISPLAY CARGO_HOME GDK_PIXBUF_MODULE_FILE XA # Variables that are set exclusively by the profile # and not by user configuration files. -PROFILE_ONLY_VARIABLES="${PROFILE_ONLY_VARIABLES} ELIBC IUSE_IMPLICIT KERNEL USERLAND USE_EXPAND_IMPLICIT USE_EXPAND_UNPREFIXED USE_EXPAND_VALUES_ELIBC USE_EXPAND_VALUES_KERNEL USE_EXPAND_VALUES_USERLAND" +PROFILE_ONLY_VARIABLES="${PROFILE_ONLY_VARIABLES} ELIBC IUSE_IMPLICIT KERNEL USE_EXPAND_IMPLICIT USE_EXPAND_UNPREFIXED USE_EXPAND_VALUES_ELIBC USE_EXPAND_VALUES_KERNEL" # 'Sane' defaults ELIBC="glibc" KERNEL="linux" -USERLAND="GNU" INPUT_DEVICES="libinput" # Accept only licenses in the FREE license group, i.e., with diff --git a/profiles/base/use.force b/profiles/base/use.force index d51d6c2ea56c..22123a5fe908 100644 --- a/profiles/base/use.force +++ b/profiles/base/use.force @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # Matt Turner <matts...@gentoo.org> (2020-08-11) @@ -10,8 +10,7 @@ libglvnd # Disabling this requires a migration to be performed. split-usr -# Force the GNU/Linux ELIBC, KERNEL, and USERLAND +# Force the GNU/Linux ELIBC and KERNEL # flags that apply to the majority of profiles. elibc_glibc kernel_linux -userland_GNU diff --git a/profiles/base/use.mask b/profiles/base/use.mask index 07ade179a443..f6587acbec12 100644 --- a/profiles/base/use.mask +++ b/profiles/base/use.mask @@ -61,9 +61,6 @@ packagekit selinux multilib -# Mask ELIBC, KERNEL, and USERLAND flags that apply to specific profiles. -userland_BSD - elibc_bionic elibc_Cygwin elibc_Darwin diff --git a/profiles/desc/userland.desc b/profiles/desc/userland.desc deleted file mode 100644 index 3b3ed55d463a..000000000000 --- a/profiles/desc/userland.desc +++ /dev/null @@ -1,9 +0,0 @@ -# Copyright 1999-2006 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -# This file contains descriptions of USERLAND USE_EXPAND flags. - -# Keep it sorted. - -GNU - USERLAND setting for systems that use the GNU userland tools -BSD - USERLAND setting for systems using BSDish userland (FreeBSD OpenBSD NetBSD DragonFly) diff --git a/profiles/embedded/make.defaults b/profiles/embedded/make.defaults index 5b6dc2b40640..fd59da10541e 100644 --- a/profiles/embedded/make.defaults +++ b/profiles/embedded/make.defaults @@ -1,4 +1,4 @@ -# Copyright 2008-2022 Gentoo Authors +# Copyright 2008-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 USE="kdrive minimal multicall zlib" @@ -16,29 +16,27 @@ PORTAGE_ECLASS_WARNING_ENABLE="0" INPUT_DEVICES="evdev" VIDEO_CARDS="fbdev" KERNEL="linux" -USERLAND="GNU" LINGUAS="en" # Profile IUSE injection (applies only to ebuilds which use EAPI 5 or later) IUSE_IMPLICIT="prefix prefix-guest prefix-stack" USE_EXPAND_UNPREFIXED="ARCH" -USE_EXPAND_IMPLICIT="ARCH ELIBC KERNEL USERLAND" +USE_EXPAND_IMPLICIT="ARCH ELIBC KERNEL" USE_EXPAND_VALUES_ARCH="alpha amd64 amd64-linux arm arm64 hppa ia64 loong m68k mips ppc ppc64 ppc64-linux ppc-macos riscv s390 sparc sparc64-solaris sparc-solaris x64-cygwin x64-macos x64-solaris x64-winnt x86 x86-linux x86-solaris x86-winnt" USE_EXPAND_VALUES_ELIBC="bionic Cygwin Darwin glibc mingw musl SunOS Winnt" USE_EXPAND_VALUES_KERNEL="Darwin linux SunOS Winnt" -USE_EXPAND_VALUES_USERLAND="BSD GNU" # Env vars to expand into USE vars. Modifying this requires prior # discussion on gentoo-...@lists.gentoo.org. -USE_EXPAND="ABI_MIPS ABI_S390 ABI_X86 ADA_TARGET ALSA_CARDS APACHE2_MODULES APACHE2_MPMS CALLIGRA_FEATURES CAMERAS COLLECTD_PLUGINS CPU_FLAGS_ARM CPU_FLAGS_PPC CPU_FLAGS_X86 CURL_SSL ELIBC FFTOOLS GPSD_PROTOCOLS GRUB_PLATFORMS INPUT_DEVICES KERNEL L10N LCD_DEVICES LIBREOFFICE_EXTENSIONS LLVM_TARGETS LUA_SINGLE_TARGET LUA_TARGETS MONKEYD_PLUGINS NGINX_MODULES_HTTP NGINX_MODULES_MAIL NGINX_MODULES_STREAM OFFICE_IMPLEMENTATION OPENMPI_FABRICS OPENMPI_OFED_FEATURES OPENMPI_RM PHP_TARGETS POSTGRES_TARGETS PYTHON_SINGLE_TARGET PYTHON_TARGETS QEMU_SOFTMMU_TARGETS QEMU_USER_TARGETS ROS_MESSAGES RUBY_TARGETS SANE_BACKENDS USERLAND UWSGI_PLUGINS VIDEO_CARDS VOICEMAIL_STORAGE XTABLES_ADDONS" +USE_EXPAND="ABI_MIPS ABI_S390 ABI_X86 ADA_TARGET ALSA_CARDS APACHE2_MODULES APACHE2_MPMS CALLIGRA_FEATURES CAMERAS COLLECTD_PLUGINS CPU_FLAGS_ARM CPU_FLAGS_PPC CPU_FLAGS_X86 CURL_SSL ELIBC FFTOOLS GPSD_PROTOCOLS GRUB_PLATFORMS INPUT_DEVICES KERNEL L10N LCD_DEVICES LIBREOFFICE_EXTENSIONS LLVM_TARGETS LUA_SINGLE_TARGET LUA_TARGETS MONKEYD_PLUGINS NGINX_MODULES_HTTP NGINX_MODULES_MAIL NGINX_MODULES_STREAM OFFICE_IMPLEMENTATION OPENMPI_FABRICS OPENMPI_OFED_FEATURES OPENMPI_RM PHP_TARGETS POSTGRES_TARGETS PYTHON_SINGLE_TARGET PYTHON_TARGETS QEMU_SOFTMMU_TARGETS QEMU_USER_TARGETS ROS_MESSAGES RUBY_TARGETS SANE_BACKENDS UWSGI_PLUGINS VIDEO_CARDS VOICEMAIL_STORAGE XTABLES_ADDONS" # USE_EXPAND variables whose contents are not shown in package manager # output. Changes need discussion on gentoo-dev. -USE_EXPAND_HIDDEN="USERLAND KERNEL ELIBC ABI_MIPS ABI_S390 ABI_X86 CPU_FLAGS_ARM CPU_FLAGS_PPC CPU_FLAGS_X86" +USE_EXPAND_HIDDEN="KERNEL ELIBC ABI_MIPS ABI_S390 ABI_X86 CPU_FLAGS_ARM CPU_FLAGS_PPC CPU_FLAGS_X86" # Variables that are set exclusively by the profile # and not by user configuration files. -PROFILE_ONLY_VARIABLES="IUSE_IMPLICIT USERLAND USE_EXPAND_IMPLICIT USE_EXPAND_UNPREFIXED USE_EXPAND_VALUES_ARCH USE_EXPAND_VALUES_ELIBC USE_EXPAND_VALUES_KERNEL USE_EXPAND_VALUES_USERLAND" +PROFILE_ONLY_VARIABLES="IUSE_IMPLICIT USE_EXPAND_IMPLICIT USE_EXPAND_UNPREFIXED USE_EXPAND_VALUES_ARCH USE_EXPAND_VALUES_ELIBC USE_EXPAND_VALUES_KERNEL" # Accept only licenses in the FREE license group, i.e., with # the freedom to use, share, modify and share modifications diff --git a/profiles/embedded/use.force b/profiles/embedded/use.force index 5885fddb4528..c03a3a61ade5 100644 --- a/profiles/embedded/use.force +++ b/profiles/embedded/use.force @@ -1,2 +1 @@ kernel_linux -userland_GNU diff --git a/profiles/features/prefix/make.defaults b/profiles/features/prefix/make.defaults index 3dbb25ed7df8..5357594cb9a4 100644 --- a/profiles/features/prefix/make.defaults +++ b/profiles/features/prefix/make.defaults @@ -1,4 +1,4 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # Michael Haubenwallner <ha...@gentoo.org> (2016-04-19) @@ -21,7 +21,3 @@ FEATURES="${FEATURES} -sandbox -usersandbox" # Prefix does not have user management and the security model does not apply. # Disable user* features by default. FEATURES="${FEATURES} -userpriv -userfetch -usersync" - -# this probably already is like this, but we assure that in prefix we -# have a GNU userland -USERLAND="GNU" diff --git a/profiles/features/prefix/use.force b/profiles/features/prefix/use.force index 843b1c7ed890..53de2c1a6799 100644 --- a/profiles/features/prefix/use.force +++ b/profiles/features/prefix/use.force @@ -1,8 +1,5 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # force prefix flag to be set prefix - -# force GNU userland (even though base profile sets this too) -userland_GNU diff --git a/profiles/features/prefix/use.mask b/profiles/features/prefix/use.mask index a273fbe66e92..482ce57f0448 100644 --- a/profiles/features/prefix/use.mask +++ b/profiles/features/prefix/use.mask @@ -1,12 +1,9 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # prefix USE flag should always be unmasked in prefix profiles -prefix -# re-add userland GNU --userland_GNU - # USE flags inherited by the base/use.defaults file that shouldn't be in Prefix gpm diff --git a/profiles/prefix/use.force b/profiles/prefix/use.force index b772df154580..c14d80f0d049 100644 --- a/profiles/prefix/use.force +++ b/profiles/prefix/use.force @@ -1,7 +1,7 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -# unforce the GNU/Linux ELIBC, KERNEL, and USERLAND +# unforce the GNU/Linux ELIBC and KERNEL # flags that come from the base profile -elibc_glibc -kernel_linux
