summaryrefslogtreecommitdiff
path: root/system
diff options
context:
space:
mode:
authorMaxime Hadjinlian <maxime.hadjinlian@gmail.com>2015-11-06 19:23:45 +0100
committerThomas Petazzoni <thomas.petazzoni@free-electrons.com>2015-11-08 14:58:05 +0100
commitb4718c3a28fc3b178253b24bd6fbb8540a724c7e (patch)
treea6f4b8b9f6c070368e7f92b76863efa999dc0419 /system
parent40c43ee0b7b09d9b126add5b21cc2f45533cb33f (diff)
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>
Diffstat (limited to 'system')
-rw-r--r--system/Config.in2
1 files changed, 1 insertions, 1 deletions
diff --git a/system/Config.in b/system/Config.in
index 4d070103f..92712a8e0 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"