From: Maxime Hadjinlian <maxime.hadjinlian@gmail.com>
Date: Fri, 6 Nov 2015 18:23:45 +0000 (+0100)
Subject: system: Fix warning when selecting systemd
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=b4718c3a28fc3b178253b24bd6fbb8540a724c7e;p=buildroot.git

system: Fix warning when selecting systemd

With systemd and a custom skeleton, you end up with the following
warning:
warning: (BR2_INIT_SYSTEMD) selects BR2_ROOTFS_MERGED_USR which has
unmet direct dependencies (BR2_ROOTFS_SKELETON_DEFAULT)

Signed-off-by: Maxime Hadjinlian <maxime.hadjinlian@gmail.com>
Acked-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---

diff --git a/system/Config.in b/system/Config.in
index 4d070103fd..92712a8e01 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
+	select BR2_ROOTFS_MERGED_USR if BR2_ROOTFS_SKELETON_DEFAULT
 	select BR2_PACKAGE_SYSTEMD
 
 comment "systemd needs (e)glibc toolchain, headers >= 3.10"