busybox: sort lists, fix when grep/find should be disabled

Reported by Oliver, who uses grep/findutils instead of
busybox grep/find in his config.

2 files changed, 95 insertions, 88 deletions

diff --git a/package/busybox/Config.in.manual b/package/busybox/Config.in.manual
index d7264a0e9..b613e91f9 100644
--- a/package/busybox/Config.in.manual
+++ b/package/busybox/Config.in.manual
@@ -17,27 +17,11 @@ default ADK_PACKAGE_BUSYBOX_MINIMAL if ADK_TARGET_WITHOUT_MMU
 
 config ADK_PACKAGE_BUSYBOX_DEFAULT
 	bool "activate standard set of applets"
-	select BUSYBOX_CMP
-	select BUSYBOX_SYNC
-	select BUSYBOX_WHOAMI
-	select BUSYBOX_LESS if !BUSYBOX_DISABLE_LESS
-	select BUSYBOX_TRUE
-	select BUSYBOX_FDISK if !BUSYBOX_DISABLE_FDISK
-	select BUSYBOX_NC
-	select BUSYBOX_RDATE
-	select BUSYBOX_GUNZIP
-	select BUSYBOX_GZIP
-	select BUSYBOX_TAR
-	select BUSYBOX_CLEAR
-	select BUSYBOX_RESET
+	select BUSYBOX_AWK
 	select BUSYBOX_BASENAME
+	select BUSYBOX_CLEAR
+	select BUSYBOX_CMP
 	select BUSYBOX_CAT
-	select BUSYBOX_DATE
-	select BUSYBOX_ID
-	select BUSYBOX_GROUPS
-	select BUSYBOX_TEST
-	select BUSYBOX_TOUCH
-	select BUSYBOX_TR
 	select BUSYBOX_CAL
 	select BUSYBOX_CHGRP
 	select BUSYBOX_CHMOD
@@ -45,15 +29,27 @@ config ADK_PACKAGE_BUSYBOX_DEFAULT
 	select BUSYBOX_CHROOT
 	select BUSYBOX_CP
 	select BUSYBOX_CUT
+	select BUSYBOX_DATE
 	select BUSYBOX_DD
 	select BUSYBOX_DF
 	select BUSYBOX_DIFF
 	select BUSYBOX_DIRNAME
 	select BUSYBOX_DU
 	select BUSYBOX_ECHO
+	select BUSYBOX_EGREP if !BUSYBOX_DISABLE_GREP
 	select BUSYBOX_ENV
 	select BUSYBOX_EXPR
+	select BUSYBOX_FDISK if !BUSYBOX_DISABLE_FDISK
+	select BUSYBOX_FIND if !BUSYBOX_DISABLE_FIND
+	select BUSYBOX_GREP if !BUSYBOX_DISABLE_GREP
+	select BUSYBOX_GROUPS
+	select BUSYBOX_GUNZIP
+	select BUSYBOX_GZIP
+	select BUSYBOX_HALT
 	select BUSYBOX_HEAD
+	select BUSYBOX_ID
+	select BUSYBOX_INIT
+	select BUSYBOX_LESS if !BUSYBOX_DISABLE_LESS
 	select BUSYBOX_LN
 	select BUSYBOX_LOSETUP
 	select BUSYBOX_LS
@@ -61,75 +57,74 @@ config ADK_PACKAGE_BUSYBOX_DEFAULT
 	select BUSYBOX_MKDIR
 	select BUSYBOX_MKFIFO
 	select BUSYBOX_MKNOD
+	select BUSYBOX_MKTEMP
 	select BUSYBOX_MV
+	select BUSYBOX_NC
 	select BUSYBOX_PRINTF
 	select BUSYBOX_PWD
+	select BUSYBOX_RDATE if !BUSYBOX_DISABLE_RDATE
+	select BUSYBOX_READLINK
+	select BUSYBOX_RESET
 	select BUSYBOX_RM
 	select BUSYBOX_RMDIR
+	select BUSYBOX_RUN_PARTS
+	select BUSYBOX_SED if !BUSYBOX_DISABLE_SED
 	select BUSYBOX_SEQ
 	select BUSYBOX_SLEEP
 	select BUSYBOX_SORT
 	select BUSYBOX_FEATURE_SORT_BIG
 	select BUSYBOX_STAT
-	select BUSYBOX_READLINK
+	select BUSYBOX_STRINGS
+	select BUSYBOX_SU
+	select BUSYBOX_SYNC
 	select BUSYBOX_TAIL
 	select BUSYBOX_FEATURE_FANCY_TAIL
+	select BUSYBOX_TAR if !BUSYBOX_DISABLE_TAR
 	select BUSYBOX_TEE
+	select BUSYBOX_TEST
+	select BUSYBOX_TIME
+	select BUSYBOX_TOUCH
+	select BUSYBOX_TR
+	select BUSYBOX_TRUE
 	select BUSYBOX_UNAME
+	select BUSYBOX_VI
 	select BUSYBOX_WC
 	select BUSYBOX_WHOAMI
 	select BUSYBOX_WHO
-	select BUSYBOX_MKTEMP
 	select BUSYBOX_WHICH
-	select BUSYBOX_VI
-	select BUSYBOX_AWK
-	select BUSYBOX_SED
-	select BUSYBOX_FIND
-	select BUSYBOX_GREP
 	select BUSYBOX_XARGS
-	select BUSYBOX_HALT
-	select BUSYBOX_INIT
-	select BUSYBOX_SU
-	select BUSYBOX_STRINGS
-	select BUSYBOX_TIME
-	select BUSYBOX_RUN_PARTS
 
 config ADK_PACKAGE_BUSYBOX_MINIMAL
 	bool "activate minimal set of applets"
-	select BUSYBOX_LESS if !BUSYBOX_DISABLE_LESS
-	select BUSYBOX_CMP
-	select BUSYBOX_TRUE
 	select BUSYBOX_AWK
-	select BUSYBOX_SED
-	select BUSYBOX_RUN_PARTS
-	select BUSYBOX_TEE
-	select BUSYBOX_SORT
-	select BUSYBOX_GUNZIP
-	select BUSYBOX_GZIP
-	select BUSYBOX_TAR
 	select BUSYBOX_BASENAME
 	select BUSYBOX_CAT
-	select BUSYBOX_DATE
-	select BUSYBOX_ID
-	select BUSYBOX_TEST
-	select BUSYBOX_TOUCH
 	select BUSYBOX_CHGRP
 	select BUSYBOX_CHMOD
 	select BUSYBOX_CHOWN
 	select BUSYBOX_CHROOT
+	select BUSYBOX_CMP
 	select BUSYBOX_CP
 	select BUSYBOX_CUT
+	select BUSYBOX_DATE
 	select BUSYBOX_DD
 	select BUSYBOX_DF
 	select BUSYBOX_DIRNAME
 	select BUSYBOX_DIFF
 	select BUSYBOX_DU
 	select BUSYBOX_ECHO
+	select BUSYBOX_EGREP if !BUSYBOX_DISABLE_GREP
 	select BUSYBOX_ENV
 	select BUSYBOX_EXPR
+	select BUSYBOX_FIND if !BUSYBOX_DISABLE_FIND
+	select BUSYBOX_GREP if !BUSYBOX_DISABLE_GREP
+	select BUSYBOX_GUNZIP
+	select BUSYBOX_GZIP
+	select BUSYBOX_HALT
 	select BUSYBOX_HEAD
-	select BUSYBOX_TAIL
-	select BUSYBOX_FEATURE_FANCY_TAIL
+	select BUSYBOX_ID
+	select BUSYBOX_INIT
+	select BUSYBOX_LESS if !BUSYBOX_DISABLE_LESS
 	select BUSYBOX_LN
 	select BUSYBOX_LS
 	select BUSYBOX_MKDIR
@@ -137,89 +132,96 @@ config ADK_PACKAGE_BUSYBOX_MINIMAL
 	select BUSYBOX_PRINTF
 	select BUSYBOX_PWD
 	select BUSYBOX_RM
+	select BUSYBOX_READLINK
+	select BUSYBOX_RUN_PARTS
+	select BUSYBOX_SED if !BUSYBOX_DISABLE_SED
+	select BUSYBOX_SORT
+	select BUSYBOX_TAIL
+	select BUSYBOX_FEATURE_FANCY_TAIL
+	select BUSYBOX_TEE
+	select BUSYBOX_TAR if !BUSYBOX_DISABLE_TAR
+	select BUSYBOX_TEST
+	select BUSYBOX_TOUCH
+	select BUSYBOX_TRUE
 	select BUSYBOX_UNAME
 	select BUSYBOX_VI
-	select BUSYBOX_FIND
-	select BUSYBOX_GREP
-	select BUSYBOX_HALT
-	select BUSYBOX_INIT
 	select BUSYBOX_WHICH
 	select BUSYBOX_WHOAMI
-	select BUSYBOX_READLINK
 
 config ADK_PACKAGE_BUSYBOX_ALL
 	bool "activate all applets"
-	select BUSYBOX_DESKTOP
-	select BUSYBOX_LESS if !BUSYBOX_DISABLE_LESS
-	select BUSYBOX_CMP
-	select BUSYBOX_SYNC
-	select BUSYBOX_TRUE
-	select BUSYBOX_FDISK
-	select BUSYBOX_FEATURE_UTMP
-	select BUSYBOX_GUNZIP
-	select BUSYBOX_GZIP
-	select BUSYBOX_TAR
-	select BUSYBOX_CLEAR
-	select BUSYBOX_RESET
+	select BUSYBOX_AWK
 	select BUSYBOX_BASENAME
-	select BUSYBOX_CAT
-	select BUSYBOX_DATE
-	select BUSYBOX_ID
-	select BUSYBOX_GROUPS
-	select BUSYBOX_TEST
-	select BUSYBOX_TOUCH
-	select BUSYBOX_TR
-	select BUSYBOX_WHO
-	select BUSYBOX_WHOAMI
 	select BUSYBOX_CAL
+	select BUSYBOX_CAT
 	select BUSYBOX_CHGRP
 	select BUSYBOX_CHMOD
 	select BUSYBOX_CHOWN
 	select BUSYBOX_CHROOT
+	select BUSYBOX_CLEAR
+	select BUSYBOX_CMP
 	select BUSYBOX_CP
 	select BUSYBOX_CUT
+	select BUSYBOX_DATE
 	select BUSYBOX_DD
+	select BUSYBOX_DESKTOP
 	select BUSYBOX_DF
-	select BUSYBOX_DIFF
+	select BUSYBOX_DIFF if !BUSYBOX_DISABLE_DIFF
 	select BUSYBOX_DIRNAME
 	select BUSYBOX_DU
 	select BUSYBOX_ECHO
+	select BUSYBOX_EGREP if !BUSYBOX_DISABLE_GREP
 	select BUSYBOX_ENV
 	select BUSYBOX_EXPR
+	select BUSYBOX_FDISK if !BUSYBOX_DISABLE_FDISK
+	select BUSYBOX_FIND if !BUSYBOX_DISABLE_FIND
+	select BUSYBOX_FEATURE_UTMP
+	select BUSYBOX_GREP if !BUSYBOX_DISABLE_GREP
+	select BUSYBOX_GROUPS
+	select BUSYBOX_GUNZIP
+	select BUSYBOX_GZIP
+	select BUSYBOX_HALT
 	select BUSYBOX_HEAD
+	select BUSYBOX_ID
+	select BUSYBOX_INIT
+	select BUSYBOX_LESS if !BUSYBOX_DISABLE_LESS
 	select BUSYBOX_LN
 	select BUSYBOX_LS
 	select BUSYBOX_MD5SUM
 	select BUSYBOX_MKDIR
 	select BUSYBOX_MKFIFO
 	select BUSYBOX_MKNOD
+	select BUSYBOX_MKTEMP
 	select BUSYBOX_MV
 	select BUSYBOX_PRINTF
 	select BUSYBOX_PWD
+	select BUSYBOX_READLINK
+	select BUSYBOX_RESET
+	select BUSYBOX_RUN_PARTS
 	select BUSYBOX_RM
+	select BUSYBOX_SED if !BUSYBOX_DISABLE_SED
 	select BUSYBOX_SLEEP
 	select BUSYBOX_SORT
 	select BUSYBOX_STAT
+	select BUSYBOX_STRINGS
+	select BUSYBOX_SU
+	select BUSYBOX_SYNC
 	select BUSYBOX_TAIL
+	select BUSYBOX_TAR if !BUSYBOX_DISABLE_TAR
 	select BUSYBOX_TEE
 	select BUSYBOX_FEATURE_FANCY_TAIL
+	select BUSYBOX_TRUE
+	select BUSYBOX_TEST
+	select BUSYBOX_TIME
+	select BUSYBOX_TOUCH
+	select BUSYBOX_TR
 	select BUSYBOX_UNAME
+	select BUSYBOX_VI
 	select BUSYBOX_WC
-	select BUSYBOX_MKTEMP
 	select BUSYBOX_WHICH
-	select BUSYBOX_VI
-	select BUSYBOX_AWK
-	select BUSYBOX_SED
-	select BUSYBOX_FIND
-	select BUSYBOX_GREP
+	select BUSYBOX_WHO
+	select BUSYBOX_WHOAMI
 	select BUSYBOX_XARGS
-	select BUSYBOX_HALT
-	select BUSYBOX_INIT
-	select BUSYBOX_SU
-	select BUSYBOX_STRINGS
-	select BUSYBOX_TIME
-	select BUSYBOX_RUN_PARTS
-	select BUSYBOX_READLINK
 
 endchoice
 
diff --git a/package/busybox/Makefile b/package/busybox/Makefile
index 5febf8ca3..f9a94828c 100644
--- a/package/busybox/Makefile
+++ b/package/busybox/Makefile
@@ -42,6 +42,11 @@ do-configure:
 		sym=$${i#BUSYBOX_DISABLE_}; \
 		symbol=$$(echo $$sym|sed -e "s#=y##"); \
 		case $$symbol in \
+		  GREP) \
+			printf "# CONFIG_GREP is not set\n" >> ${WRKBUILD}/.config; \
+			printf "# CONFIG_EGREP is not set\n" >> ${WRKBUILD}/.config; \
+			printf "# CONFIG_FGREP is not set\n" >> ${WRKBUILD}/.config; \
+			;; \
 		  KMOD) \
 			printf "# CONFIG_MODINFO is not set\n" >> ${WRKBUILD}/.config; \
 			printf "# CONFIG_MODPROBE_SMALL is not set\n" >> ${WRKBUILD}/.config; \