jeans/motioneyeos
jeans/motioneyeos
1
0
Fork 0
mirror of https://github.com/motioneye-project/motioneyeos.git synced 2025-07-26 04:36:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

system: allow selecting merged /usr along with custom rootfs skeleton

Browse Source 
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:
Carlos Santos 2018-05-07 11:44:31 -03:00 committed by Arnout Vandecappelle (Essensium/Mind)
parent 0c96bda11e
commit 0dd0a58351
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
system/Config.in
View File

@ -31,10 +31,6 @@ config BR2_ROOTFS_SKELETON_CUSTOM_PATH
help help
Path to custom target skeleton. 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 endif
if BR2_ROOTFS_SKELETON_DEFAULT if BR2_ROOTFS_SKELETON_DEFAULT
@ -192,8 +188,6 @@ config BR2_ROOTFS_DEVICE_TABLE_SUPPORTS_EXTENDED_ATTRIBUTES
help help
Support extended attributes handling in device tables Support extended attributes handling in device tables
if BR2_ROOTFS_SKELETON_DEFAULT
config BR2_ROOTFS_MERGED_USR config BR2_ROOTFS_MERGED_USR
bool "Use symlinks to /usr for /bin, /sbin and /lib" bool "Use symlinks to /usr for /bin, /sbin and /lib"
help help
@ -206,6 +200,8 @@ config BR2_ROOTFS_MERGED_USR
symlinks to their counterparts in /usr. In this case, /usr can symlinks to their counterparts in /usr. In this case, /usr can
not be a separate filesystem. not be a separate filesystem.
if BR2_ROOTFS_SKELETON_DEFAULT
config BR2_TARGET_ENABLE_ROOT_LOGIN config BR2_TARGET_ENABLE_ROOT_LOGIN
bool "Enable root login with password" bool "Enable root login with password"
default y default y