diff options
author | Waldemar Brodkorb <wbx@uclibc-ng.org> | 2016-01-24 21:00:07 +0100 |
---|---|---|
committer | Waldemar Brodkorb <wbx@uclibc-ng.org> | 2016-01-24 21:00:07 +0100 |
commit | 462b36473f28182d23f795cb93186fb4637856f2 (patch) | |
tree | ba20e106df5ab5a0a9d8760a7cecc838af593354 /package/busybox | |
parent | 645086ca124d0f8649f8c0038e003260a4e39f38 (diff) |
resolve merge
Diffstat (limited to 'package/busybox')
-rw-r--r-- | package/busybox/Config.in.manual | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/package/busybox/Config.in.manual b/package/busybox/Config.in.manual index 6e8eb6299..94c30a7d9 100644 --- a/package/busybox/Config.in.manual +++ b/package/busybox/Config.in.manual @@ -18,6 +18,7 @@ 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_LESS if !BUSYBOX_DISABLE_LESS select BUSYBOX_TRUE @@ -91,6 +92,7 @@ config ADK_PACKAGE_BUSYBOX_DEFAULT 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 @@ -143,6 +145,7 @@ 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 |