From adcc48e0b25fb6a9759bc8d889badbbad9e02954 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Mon, 9 Nov 2015 21:40:32 +0100 Subject: [PATCH] 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 --- system/Config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/system/Config.in b/system/Config.in index 92712a8e01..4d070103fd 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" -- 2.30.2