aboutsummaryrefslogtreecommitdiff
path: root/system
diff options
context:
space:
mode:
authorGravatar Carlos Santos <casantos@datacom.ind.br>2018-05-07 11:44:31 -0300
committerGravatar Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>2019-02-06 17:11:38 +0100
commit0dd0a583510f72ef14b73e4fa2d44ff65febd833 (patch)
treec220b65018cd6377123e74e09497a0cffbff05be /system
parent0c96bda11eb26ada660dcd31843fbc9523be6062 (diff)
downloadbuildroot-0dd0a583510f72ef14b73e4fa2d44ff65febd833.tar.gz
buildroot-0dd0a583510f72ef14b73e4fa2d44ff65febd833.tar.bz2
system: allow selecting merged /usr along with custom rootfs skeleton
If the user is brave enough to use a custom rootfs skeleton then we must not prevent using merged /usr too. Actually it is already possible to do this, although indirectly, by selecting BR2_INIT_SYSTEMD. Signed-off-by: Carlos Santos <casantos@datacom.ind.br> Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Diffstat (limited to 'system')
-rw-r--r--system/Config.in8
1 files changed, 2 insertions, 6 deletions
diff --git a/system/Config.in b/system/Config.in
index 9941807e5d..498b56e222 100644
--- a/system/Config.in
+++ b/system/Config.in
@@ -31,10 +31,6 @@ config BR2_ROOTFS_SKELETON_CUSTOM_PATH
help
Path to custom target skeleton.
-# dummy config so merged /usr workarounds can also be activated for
-# custom rootfs skeleton
-config BR2_ROOTFS_MERGED_USR
-
endif
if BR2_ROOTFS_SKELETON_DEFAULT
@@ -192,8 +188,6 @@ config BR2_ROOTFS_DEVICE_TABLE_SUPPORTS_EXTENDED_ATTRIBUTES
help
Support extended attributes handling in device tables
-if BR2_ROOTFS_SKELETON_DEFAULT
-
config BR2_ROOTFS_MERGED_USR
bool "Use symlinks to /usr for /bin, /sbin and /lib"
help
@@ -206,6 +200,8 @@ config BR2_ROOTFS_MERGED_USR
symlinks to their counterparts in /usr. In this case, /usr can
not be a separate filesystem.
+if BR2_ROOTFS_SKELETON_DEFAULT
+
config BR2_TARGET_ENABLE_ROOT_LOGIN
bool "Enable root login with password"
default y