aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Yann E. MORIN <yann.morin.1998@free.fr>2018-07-08 11:46:10 +0200
committerGravatar Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>2018-07-08 13:08:06 +0200
commit06d45770d1ca2e096ae23755170bb2dd713f9816 (patch)
tree032f0d4bae412abac9d7d503aff3f943e961338a
parentaec0e84de74fdd24da2ebb97f8418f34309f550a (diff)
downloadbuildroot-06d45770d1ca2e096ae23755170bb2dd713f9816.tar.gz
buildroot-06d45770d1ca2e096ae23755170bb2dd713f9816.tar.bz2
package/busybox: invert dependency with coreutils
Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr> Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
-rw-r--r--package/busybox/busybox.mk1
-rw-r--r--package/coreutils/coreutils.mk6
2 files changed, 1 insertions, 6 deletions
diff --git a/package/busybox/busybox.mk b/package/busybox/busybox.mk
index 6351869330..748f05aca3 100644
--- a/package/busybox/busybox.mk
+++ b/package/busybox/busybox.mk
@@ -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) \
diff --git a/package/coreutils/coreutils.mk b/package/coreutils/coreutils.mk
index 4ef888829f..3cb96589f2 100644
--- a/package/coreutils/coreutils.mk
+++ b/package/coreutils/coreutils.mk
@@ -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