e2fsprogs: avoid conflict with util-linux fsck wrapper

The fsck wrapper from util-linux is better maintained, so it should be
preferred. In particular, systemd relies on features in the util-linux
fsck wrapper that don't exist in the e2fsprogs one. However, since
e2fsprogs depends on util-linux, the one from e2fsprogs currently has
precedence. So in order to have e2fsck from e2fsprogs and the fsck
wrapper from util-linux, we disable e2fsprogs' fsck if the one from
util-linux is selected.

Signed-off-by: Carlos Santos <casantos@datacom.ind.br>
CC: Maxime Hadjinlian <maxime.hadjinlian@gmail.com>
[Arnout: don't add comment]
Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>

diff --git a/package/e2fsprogs/Config.in b/package/e2fsprogs/Config.in
index 23c4db532925de4de4c1fefc7345812625615d72..b3d12b4a63d0804c6dc446355035e74ba5bbb812 100644 (file)
--- a/package/e2fsprogs/Config.in
+++ b/package/e2fsprogs/Config.in
@@ -45,6 +45,7 @@ comment "e4defrag needs a glibc or musl toolchain"
 config BR2_PACKAGE_E2FSPROGS_FSCK
        bool "fsck"
        default y
+       depends on !BR2_PACKAGE_UTIL_LINUX_FSCK
        help
          Check and repair a Linux file system. This is a wrapper around
          the filesystem-specific fsck tools.