From a25a88d9a79d6f97813fe9e80b511df1e75e16d6 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Sat, 3 Mar 2012 19:37:13 +0100 Subject: [PATCH] busybox: replace 'grep' with busybox's 'grep' applet Signed-off-by: Stephan Raue --- packages/sysutils/busybox/config/busybox.conf | 8 ++++---- packages/sysutils/busybox/meta | 2 +- packages/sysutils/pm-utils/meta | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/packages/sysutils/busybox/config/busybox.conf b/packages/sysutils/busybox/config/busybox.conf index 200a54e6d8..e6b42695ad 100644 --- a/packages/sysutils/busybox/config/busybox.conf +++ b/packages/sysutils/busybox/config/busybox.conf @@ -402,10 +402,10 @@ CONFIG_FEATURE_FIND_PATH=y # CONFIG_FEATURE_FIND_REGEX is not set # CONFIG_FEATURE_FIND_CONTEXT is not set CONFIG_FEATURE_FIND_LINKS=y -# CONFIG_GREP is not set -# CONFIG_FEATURE_GREP_EGREP_ALIAS is not set -# CONFIG_FEATURE_GREP_FGREP_ALIAS is not set -# CONFIG_FEATURE_GREP_CONTEXT is not set +CONFIG_GREP=y +CONFIG_FEATURE_GREP_EGREP_ALIAS=y +CONFIG_FEATURE_GREP_FGREP_ALIAS=y +CONFIG_FEATURE_GREP_CONTEXT=y CONFIG_XARGS=y CONFIG_FEATURE_XARGS_SUPPORT_CONFIRMATION=y CONFIG_FEATURE_XARGS_SUPPORT_QUOTES=y diff --git a/packages/sysutils/busybox/meta b/packages/sysutils/busybox/meta index 2e7e9b44c1..4d49a0a96b 100644 --- a/packages/sysutils/busybox/meta +++ b/packages/sysutils/busybox/meta @@ -25,7 +25,7 @@ PKG_ARCH="any" PKG_LICENSE="GPL" PKG_SITE="http://www.busybox.net" PKG_URL="http://busybox.net/downloads/$PKG_NAME-$PKG_VERSION.tar.bz2" -PKG_DEPENDS="kexec-tools v86d splashutils grep hdparm speedcontrol pastebinit" +PKG_DEPENDS="kexec-tools v86d splashutils hdparm speedcontrol pastebinit" PKG_BUILD_DEPENDS="toolchain busybox-hosttools" PKG_PRIORITY="required" PKG_SECTION="system" diff --git a/packages/sysutils/pm-utils/meta b/packages/sysutils/pm-utils/meta index 55275f2b8a..998ed9501d 100644 --- a/packages/sysutils/pm-utils/meta +++ b/packages/sysutils/pm-utils/meta @@ -25,7 +25,7 @@ PKG_ARCH="any" PKG_LICENSE="GPL" PKG_SITE="http://pm-utils.freedesktop.org/wiki/" PKG_URL="http://pm-utils.freedesktop.org/releases/$PKG_NAME-$PKG_VERSION.tar.gz" -PKG_DEPENDS="grep" +PKG_DEPENDS="busybox" PKG_BUILD_DEPENDS="toolchain" PKG_PRIORITY="optional" PKG_SECTION="system"