Преглед изворни кода

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>
Yann E. MORIN пре 7 година
родитељ
комит
06d45770d1
2 измењених фајлова са 1 додато и 6 уклоњено
  1. 1 0
      package/busybox/busybox.mk
  2. 0 6
      package/coreutils/coreutils.mk

+ 1 - 0
package/busybox/busybox.mk

@@ -22,6 +22,7 @@ BUSYBOX_LDFLAGS = \
 
 
 # Packages that provide commands that may also be busybox applets:
 # Packages that provide commands that may also be busybox applets:
 BUSYBOX_DEPENDENCIES = \
 BUSYBOX_DEPENDENCIES = \
+	$(if $(BR2_PACKAGE_COREUTILS),coreutils) \
 	$(if $(BR2_PACKAGE_CPIO),cpio) \
 	$(if $(BR2_PACKAGE_CPIO),cpio) \
 	$(if $(BR2_PACKAGE_DCRON),dcron) \
 	$(if $(BR2_PACKAGE_DCRON),dcron) \
 	$(if $(BR2_PACKAGE_DEBIANUTILS),debianutils) \
 	$(if $(BR2_PACKAGE_DEBIANUTILS),debianutils) \

+ 0 - 6
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 \
 	kill link ln ls mkdir mknod mktemp mv nice printenv pwd rm rmdir \
 	vdir sleep stty sync touch true uname join
 	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)
 ifeq ($(BR2_PACKAGE_ACL),y)
 COREUTILS_DEPENDENCIES += acl
 COREUTILS_DEPENDENCIES += acl
 else
 else