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>

diff --git a/system/Config.in b/system/Config.in
index 92712a8e0169c6e6ee56e8ec272c67a3bd0c3ef2..4d070103fd91cf90a78d32fb78ce24baad499881 100644 (file)
--- 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"