mirror/buildroot
1
0
Fork 0
mirror of https://gitlab.com/buildroot.org/buildroot.git synced 2026-09-30 22:11:59 -09:00
Code Issues Packages Projects Releases Wiki Activity

Revert "system: Fix warning when selecting systemd"

Browse Source 
This reverts commit b4718c3a28.

The BR2_ROOTFS_MERGED_USR symbol is used to activate various workarounds for
a merged /usr by packages, so it should be active even with a custom rootfs
skeleton.

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
This commit is contained in:
Peter Korsgaard
2015-11-09 21:40:32 +01:00
parent 54fde89493
commit adcc48e0b2
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
system/Config.in
View File

@@ -92,7 +92,7 @@ config BR2_INIT_SYSTEMD
depends on BR2_USE_MMU depends on BR2_USE_MMU
depends on !BR2_STATIC_LIBS depends on !BR2_STATIC_LIBS
depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_10 depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_10
select BR2_ROOTFS_MERGED_USR if BR2_ROOTFS_SKELETON_DEFAULT select BR2_ROOTFS_MERGED_USR
select BR2_PACKAGE_SYSTEMD select BR2_PACKAGE_SYSTEMD
comment "systemd needs (e)glibc toolchain, headers >= 3.10" comment "systemd needs (e)glibc toolchain, headers >= 3.10"