diff options
| author |  Yann E. MORIN <yann.morin.1998@free.fr> | 2018-07-08 11:46:04 +0200 |
|---|---|---|
| committer |  Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be> | 2018-07-08 13:08:05 +0200 |
| commit | 1561592231a086b3384ddc1ce2ad05eb3c29376c (patch) | |
| tree | c225fdb008d0fc978fc950703d14020b87877d96 /package/e2fsprogs | |
| parent | ef265261cfbd6c737faa984a7234279d0df1365e (diff) | |
| download | buildroot-1561592231a086b3384ddc1ce2ad05eb3c29376c.tar.gz buildroot-1561592231a086b3384ddc1ce2ad05eb3c29376c.tar.bz2 | |
package/busybox: invert dependency with e2fsprogs
Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Diffstat (limited to 'package/e2fsprogs')
| -rw-r--r-- | package/e2fsprogs/e2fsprogs.mk | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/package/e2fsprogs/e2fsprogs.mk b/package/e2fsprogs/e2fsprogs.mk index 316546a8d7..efc10d0e99 100644 --- a/package/e2fsprogs/e2fsprogs.mk +++ b/package/e2fsprogs/e2fsprogs.mk @@ -17,12 +17,6 @@ E2FSPROGS_INSTALL_STAGING = YES E2FSPROGS_DEPENDENCIES = host-pkgconf util-linux HOST_E2FSPROGS_DEPENDENCIES = host-pkgconf host-util-linux -# If both e2fsprogs and busybox are selected, make certain e2fsprogs -# wins the fight over who gets to have their utils actually installed -ifeq ($(BR2_PACKAGE_BUSYBOX),y) -E2FSPROGS_DEPENDENCIES += busybox -endif - # e4defrag doesn't build on older systems like RHEL5.x, and we don't # need it on the host anyway. # Disable fuse2fs as well to avoid carrying over deps, and it's unused @@ -35,8 +29,8 @@ HOST_E2FSPROGS_CONF_OPTS = \ --enable-symlink-install \ --disable-testio-debug -# Set the binary directories to "/bin" and "/sbin" to override programs -# installed by busybox. +# Set the binary directories to "/bin" and "/sbin", as busybox does, +# so that we do not end up with two versions of e2fs tools. E2FSPROGS_CONF_OPTS = \ --bindir=/bin \ --sbindir=/sbin \ |