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>
This commit is contained in:
parent
0c96bda11e
commit
0dd0a58351
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user