* Some distros have not just merged / and /usr, they
have also merged /usr/bin and /usr/sbin. By giving
users the choice of merging */bin and */sbin,
Gentoo follows suit.
Signed-off-by: David Seifert <s...@gentoo.org>
---
profiles/base/make.defaults | 8 ++++----
profiles/base/use.force | 1 +
profiles/use.desc | 1 +
3 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/profiles/base/make.defaults b/profiles/base/make.defaults
index b4b872168f1..426c1473f8f 100644
--- a/profiles/base/make.defaults
+++ b/profiles/base/make.defaults
@@ -117,8 +117,8 @@ USE="${USE} cxx"
USE="${USE} xattr"
# Mike Gilbert <flop...@gentoo.org> (2019-07-14)
-# Enable split-usr by default to keep existing installs as-is.
-USE="${USE} split-usr"
+# Enable split-sbin & split-usr by default to keep existing installs as-is.
+USE="${USE} split-sbin split-usr"
# Tiziano Müller <dev-z...@gentoo.org> (2010-01-24)
# We usually don't want python to (re)write .py[co] files during phase runs
@@ -130,8 +130,8 @@ PYTHONDONTWRITEBYTECODE="1"
# Add in expanded PYTHON_TARGETS or stage1 builds break because of USE="-*
${BOOTSTRAP_USE}"
# This MUST be kept in sync with the PYTHON_TARGETS below
# Mike Gilbert <flop...@gentoo.org> (2018-05-23)
-# sys-apps/baslayout-2.5 needs split-usr enabled.
-BOOTSTRAP_USE="unicode internal-glib pkg-config split-usr
python_targets_python3_6 python_targets_python2_7"
+# sys-apps/baslayout-2.5 needs split-sbin & split-usr enabled.
+BOOTSTRAP_USE="unicode internal-glib pkg-config split-sbin split-usr
python_targets_python3_6 python_targets_python2_7"
# Mike Gilbert <flop...@gentoo.org> (2012-05-15)
# Default target(s) for python-r1.eclass
diff --git a/profiles/base/use.force b/profiles/base/use.force
index b864455a7c8..538c0b37793 100644
--- a/profiles/base/use.force
+++ b/profiles/base/use.force
@@ -3,6 +3,7 @@
# Mike Gilbert <flop...@gentoo.org> (2019-07-20)
# Disabling this requires a migration to be performed.
+split-sbin
split-usr
# Force the GNU/Linux ELIBC, KERNEL, and USERLAND
diff --git a/profiles/use.desc b/profiles/use.desc
index 7fe2510544d..e48b718cb8f 100644
--- a/profiles/use.desc
+++ b/profiles/use.desc
@@ -296,6 +296,7 @@ source - Zip the sources and install them
sox - Add support for Sound eXchange (SoX)
speex - Add support for the speex audio codec (used for speech)
spell - Add dictionary support
+split-sbin - Enable behavior to support maintaining /bin and /usr/bin
separately from /sbin and /usr/sbin
split-usr - Enable behavior to support maintaining /bin and /lib separately
from /usr/bin and /usr/lib
sqlite - Add support for sqlite - embedded sql database
ssl - Add support for SSL/TLS connections (Secure Socket Layer / Transport
Layer Security)
--
2.23.0
