diff options
| author | Peter Korsgaard <peter@korsgaard.com> | 2015-11-09 21:40:32 +0100 |
|---|---|---|
| committer | Peter Korsgaard <peter@korsgaard.com> | 2015-11-09 21:40:32 +0100 |
| commit | adcc48e0b25fb6a9759bc8d889badbbad9e02954 (patch) | |
| tree | f50707f0eb57e6b44bff87b3a4ac655ff6301cc8 /system | |
| parent | 54fde8949373d6e010eefaf1e1fa8edc19cb4d4f (diff) | |
Revert "system: Fix warning when selecting systemd"
This reverts commit b4718c3a28fc3b178253b24bd6fbb8540a724c7e.
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>
Diffstat (limited to 'system')
| -rw-r--r-- | system/Config.in | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/system/Config.in b/system/Config.in index 92712a8e0..4d070103f 100644 --- a/system/Config.in +++ b/system/Config.in @@ -92,7 +92,7 @@ config BR2_INIT_SYSTEMD depends on BR2_USE_MMU depends on !BR2_STATIC_LIBS 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 comment "systemd needs (e)glibc toolchain, headers >= 3.10" |