package/busybox: invert dependency with grep

Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>

diff --git a/package/busybox/busybox.mk b/package/busybox/busybox.mk
index b00341c576c90780cc28c83f86662262a6d0bbf7..f614576de7e32d62c53daa70632fa86ade62120a 100644 (file)
--- 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_GREP),grep) \
        $(if $(BR2_PACKAGE_GZIP),gzip) \
        $(if $(BR2_PACKAGE_I2C_TOOLS),i2c-tools) \
        $(if $(BR2_PACKAGE_IFENSLAVE),ifenslave) \

diff --git a/package/grep/grep.mk b/package/grep/grep.mk
index 6e44a189f0abbda54f44076da30a84620f338a15..730f36a344f58fbac66a84edd60298fab348ddd0 100644 (file)
--- a/package/grep/grep.mk
+++ b/package/grep/grep.mk
@@ -25,9 +25,4 @@ else
 GREP_CONF_OPTS += --disable-perl-regexp
 endif
 
-# Full grep preferred over busybox grep
-ifeq ($(BR2_PACKAGE_BUSYBOX),y)
-GREP_DEPENDENCIES += busybox
-endif
-
 $(eval $(autotools-package))