From 3fa18f1a440ac484ef8ab84f1cf2417e2f6f02ba Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sun, 8 Jul 2018 11:46:01 +0200 Subject: [PATCH] package/busybox: invert dependency with grep Signed-off-by: Yann E. MORIN Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/busybox/busybox.mk | 1 + package/grep/grep.mk | 5 ----- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/package/busybox/busybox.mk b/package/busybox/busybox.mk index b00341c576..f614576de7 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_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 6e44a189f0..730f36a344 100644 --- 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)) -- 2.30.2