diff options
author | Waldemar Brodkorb <wbx@openadk.org> | 2010-03-10 18:29:50 +0100 |
---|---|---|
committer | Waldemar Brodkorb <wbx@openadk.org> | 2010-03-10 18:29:50 +0100 |
commit | c0011b3b7074f8b47cbec36177eff42b18871d4d (patch) | |
tree | 8bedce53f4bee4d288fdca28352fb6bff85dfc7f /package/busybox/config | |
parent | e04d6dc7eff54a2b851b65dd6cbcc78b8f573f64 (diff) | |
parent | 3d2e9517d920b88abde391b59ca0069351be3a87 (diff) |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'package/busybox/config')
-rw-r--r-- | package/busybox/config/findutils/Config.in | 3 | ||||
-rw-r--r-- | package/busybox/config/util-linux/Config.in | 1 |
2 files changed, 3 insertions, 1 deletions
diff --git a/package/busybox/config/findutils/Config.in b/package/busybox/config/findutils/Config.in index ba2e5f557..1a1e0f4d5 100644 --- a/package/busybox/config/findutils/Config.in +++ b/package/busybox/config/findutils/Config.in @@ -182,7 +182,8 @@ config BUSYBOX_FEATURE_FIND_CONTEXT config BUSYBOX_GREP bool "grep" - default y + default y if !ADK_PACKAGE_GREP + depends on !ADK_PACKAGE_GREP help grep is used to search files for a specified pattern. diff --git a/package/busybox/config/util-linux/Config.in b/package/busybox/config/util-linux/Config.in index 01020bde9..5951e8dec 100644 --- a/package/busybox/config/util-linux/Config.in +++ b/package/busybox/config/util-linux/Config.in @@ -283,6 +283,7 @@ config BUSYBOX_HD config BUSYBOX_HWCLOCK bool "hwclock" + default y if ADK_TARGET_WITH_RTC default n help The hwclock utility is used to read and set the hardware clock |