| 1 |
commit: 82a7903bb07a391b7efd153342fabedebda4075f |
| 2 |
Author: David Seifert <soap <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Jan 6 11:02:28 2022 +0000 |
| 4 |
Commit: David Seifert <soap <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Jan 6 11:02:28 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=82a7903b |
| 7 |
|
| 8 |
profiles: remove amd64-fbsd/x86-fbsd keywords |
| 9 |
|
| 10 |
Closes: https://github.com/gentoo/gentoo/pull/23649 |
| 11 |
Signed-off-by: David Seifert <soap <AT> gentoo.org> |
| 12 |
|
| 13 |
profiles/arch/base/make.defaults | 4 ++-- |
| 14 |
profiles/arch/base/use.mask | 4 +--- |
| 15 |
profiles/embedded/make.defaults | 2 +- |
| 16 |
3 files changed, 4 insertions(+), 6 deletions(-) |
| 17 |
|
| 18 |
diff --git a/profiles/arch/base/make.defaults b/profiles/arch/base/make.defaults |
| 19 |
index bbab57a07425..9abd9bab3d01 100644 |
| 20 |
--- a/profiles/arch/base/make.defaults |
| 21 |
+++ b/profiles/arch/base/make.defaults |
| 22 |
@@ -1,8 +1,8 @@ |
| 23 |
-# Copyright 1999-2019 Gentoo Authors |
| 24 |
+# Copyright 1999-2022 Gentoo Authors |
| 25 |
# Distributed under the terms of the GNU General Public License v2 |
| 26 |
|
| 27 |
USE_EXPAND_UNPREFIXED="ARCH" |
| 28 |
USE_EXPAND_IMPLICIT="ARCH" |
| 29 |
-USE_EXPAND_VALUES_ARCH="alpha amd64 amd64-fbsd amd64-linux arm arm64 arm64-macos hppa ia64 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-fbsd x86-linux x86-solaris x86-winnt" |
| 30 |
+USE_EXPAND_VALUES_ARCH="alpha amd64 amd64-linux arm arm64 arm64-macos hppa ia64 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" |
| 31 |
|
| 32 |
PROFILE_ONLY_VARIABLES="${PROFILE_ONLY_VARIABLES} ARCH USE_EXPAND_VALUES_ARCH" |
| 33 |
|
| 34 |
diff --git a/profiles/arch/base/use.mask b/profiles/arch/base/use.mask |
| 35 |
index 497a91c05748..b401aee243d9 100644 |
| 36 |
--- a/profiles/arch/base/use.mask |
| 37 |
+++ b/profiles/arch/base/use.mask |
| 38 |
@@ -1,4 +1,4 @@ |
| 39 |
-# Copyright 1999-2021 Gentoo Authors |
| 40 |
+# Copyright 1999-2022 Gentoo Authors |
| 41 |
# Distributed under the terms of the GNU General Public License v2 |
| 42 |
|
| 43 |
# Michał Górny <mgorny@g.o> (2021-01-07) |
| 44 |
@@ -223,7 +223,6 @@ apparmor |
| 45 |
# Mask flags that correspond to all possible ARCH values. |
| 46 |
alpha |
| 47 |
amd64 |
| 48 |
-amd64-fbsd |
| 49 |
arm |
| 50 |
arm64 |
| 51 |
hppa |
| 52 |
@@ -236,4 +235,3 @@ riscv |
| 53 |
s390 |
| 54 |
sparc |
| 55 |
x86 |
| 56 |
-x86-fbsd |
| 57 |
|
| 58 |
diff --git a/profiles/embedded/make.defaults b/profiles/embedded/make.defaults |
| 59 |
index a86ce015b4d4..9a78933d6fd1 100644 |
| 60 |
--- a/profiles/embedded/make.defaults |
| 61 |
+++ b/profiles/embedded/make.defaults |
| 62 |
@@ -23,7 +23,7 @@ LINGUAS="en" |
| 63 |
IUSE_IMPLICIT="prefix prefix-guest prefix-stack" |
| 64 |
USE_EXPAND_UNPREFIXED="ARCH" |
| 65 |
USE_EXPAND_IMPLICIT="ARCH ELIBC KERNEL USERLAND" |
| 66 |
-USE_EXPAND_VALUES_ARCH="alpha amd64 amd64-fbsd amd64-linux arm arm64 hppa ia64 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-fbsd x86-linux x86-solaris x86-winnt" |
| 67 |
+USE_EXPAND_VALUES_ARCH="alpha amd64 amd64-linux arm arm64 hppa ia64 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" |
| 68 |
USE_EXPAND_VALUES_ELIBC="bionic Cygwin Darwin glibc mingw musl SunOS Winnt" |
| 69 |
USE_EXPAND_VALUES_KERNEL="Darwin linux SunOS Winnt" |
| 70 |
USE_EXPAND_VALUES_USERLAND="BSD GNU" |
Archives