| 1 |
* Some distros have not just merged / and /usr, they |
| 2 |
have also merged /usr/bin and /usr/sbin. By giving |
| 3 |
users the choice of merging */bin and */sbin, |
| 4 |
Gentoo follows suit. |
| 5 |
|
| 6 |
Signed-off-by: David Seifert <soap@g.o> |
| 7 |
--- |
| 8 |
profiles/base/make.defaults | 8 ++++---- |
| 9 |
profiles/base/use.force | 1 + |
| 10 |
profiles/use.desc | 1 + |
| 11 |
3 files changed, 6 insertions(+), 4 deletions(-) |
| 12 |
|
| 13 |
diff --git a/profiles/base/make.defaults b/profiles/base/make.defaults |
| 14 |
index b4b872168f1..426c1473f8f 100644 |
| 15 |
--- a/profiles/base/make.defaults |
| 16 |
+++ b/profiles/base/make.defaults |
| 17 |
@@ -117,8 +117,8 @@ USE="${USE} cxx" |
| 18 |
USE="${USE} xattr" |
| 19 |
|
| 20 |
# Mike Gilbert <floppym@g.o> (2019-07-14) |
| 21 |
-# Enable split-usr by default to keep existing installs as-is. |
| 22 |
-USE="${USE} split-usr" |
| 23 |
+# Enable split-sbin & split-usr by default to keep existing installs as-is. |
| 24 |
+USE="${USE} split-sbin split-usr" |
| 25 |
|
| 26 |
# Tiziano Müller <dev-zero@g.o> (2010-01-24) |
| 27 |
# We usually don't want python to (re)write .py[co] files during phase runs |
| 28 |
@@ -130,8 +130,8 @@ PYTHONDONTWRITEBYTECODE="1" |
| 29 |
# Add in expanded PYTHON_TARGETS or stage1 builds break because of USE="-* ${BOOTSTRAP_USE}" |
| 30 |
# This MUST be kept in sync with the PYTHON_TARGETS below |
| 31 |
# Mike Gilbert <floppym@g.o> (2018-05-23) |
| 32 |
-# sys-apps/baslayout-2.5 needs split-usr enabled. |
| 33 |
-BOOTSTRAP_USE="unicode internal-glib pkg-config split-usr python_targets_python3_6 python_targets_python2_7" |
| 34 |
+# sys-apps/baslayout-2.5 needs split-sbin & split-usr enabled. |
| 35 |
+BOOTSTRAP_USE="unicode internal-glib pkg-config split-sbin split-usr python_targets_python3_6 python_targets_python2_7" |
| 36 |
|
| 37 |
# Mike Gilbert <floppym@g.o> (2012-05-15) |
| 38 |
# Default target(s) for python-r1.eclass |
| 39 |
diff --git a/profiles/base/use.force b/profiles/base/use.force |
| 40 |
index b864455a7c8..538c0b37793 100644 |
| 41 |
--- a/profiles/base/use.force |
| 42 |
+++ b/profiles/base/use.force |
| 43 |
@@ -3,6 +3,7 @@ |
| 44 |
|
| 45 |
# Mike Gilbert <floppym@g.o> (2019-07-20) |
| 46 |
# Disabling this requires a migration to be performed. |
| 47 |
+split-sbin |
| 48 |
split-usr |
| 49 |
|
| 50 |
# Force the GNU/Linux ELIBC, KERNEL, and USERLAND |
| 51 |
diff --git a/profiles/use.desc b/profiles/use.desc |
| 52 |
index 7fe2510544d..e48b718cb8f 100644 |
| 53 |
--- a/profiles/use.desc |
| 54 |
+++ b/profiles/use.desc |
| 55 |
@@ -296,6 +296,7 @@ source - Zip the sources and install them |
| 56 |
sox - Add support for Sound eXchange (SoX) |
| 57 |
speex - Add support for the speex audio codec (used for speech) |
| 58 |
spell - Add dictionary support |
| 59 |
+split-sbin - Enable behavior to support maintaining /bin and /usr/bin separately from /sbin and /usr/sbin |
| 60 |
split-usr - Enable behavior to support maintaining /bin and /lib separately from /usr/bin and /usr/lib |
| 61 |
sqlite - Add support for sqlite - embedded sql database |
| 62 |
ssl - Add support for SSL/TLS connections (Secure Socket Layer / Transport Layer Security) |
| 63 |
-- |
| 64 |
2.23.0 |
Archives