package/busybox: invert dependency with coreutils
authorYann E. MORIN <yann.morin.1998@free.fr>
Sun, 8 Jul 2018 09:46:10 +0000 (11:46 +0200)
committerArnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Sun, 8 Jul 2018 11:08:06 +0000 (13:08 +0200)
Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
package/busybox/busybox.mk
package/coreutils/coreutils.mk

index 635186933000933282a451e0a1d4e9cc2a49d14a..748f05aca31afd50e4ffd913a63cb82cb04921fe 100644 (file)
@@ -22,6 +22,7 @@ BUSYBOX_LDFLAGS = \
 
 # Packages that provide commands that may also be busybox applets:
 BUSYBOX_DEPENDENCIES = \
+       $(if $(BR2_PACKAGE_COREUTILS),coreutils) \
        $(if $(BR2_PACKAGE_CPIO),cpio) \
        $(if $(BR2_PACKAGE_DCRON),dcron) \
        $(if $(BR2_PACKAGE_DEBIANUTILS),debianutils) \
index 4ef888829f9f75c4d5412618c87e9255fd3cfbbb..3cb96589f228c9eabc51c07c92b4eae7408d7ee3 100644 (file)
@@ -59,12 +59,6 @@ COREUTILS_BIN_PROGS = cat chgrp chmod chown cp date dd df dir echo false \
        kill link ln ls mkdir mknod mktemp mv nice printenv pwd rm rmdir \
        vdir sleep stty sync touch true uname join
 
-# If both coreutils and busybox are selected, make certain coreutils
-# wins the fight over who gets to have their utils actually installed.
-ifeq ($(BR2_PACKAGE_BUSYBOX),y)
-COREUTILS_DEPENDENCIES = busybox
-endif
-
 ifeq ($(BR2_PACKAGE_ACL),y)
 COREUTILS_DEPENDENCIES += acl
 else