diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2010-07-15 12:35:48 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2010-07-15 12:35:48 +0200 |
| commit | 7c38c7a7843d881837f000b9465bd59a0e918f7f (patch) | |
| tree | 738c19bacd1c0dd4f939298ceaf59013a76dc6f6 /package/busybox | |
| parent | cad729cef7e4226eb09ca510546776ac4e8b551d (diff) | |
| parent | 7838fca0479a0d4affcb245ec042ead7ae1d7b3b (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'package/busybox')
| -rw-r--r-- | package/busybox/config/archival/Config.in | 2 | ||||
| -rw-r--r-- | package/busybox/config/networking/Config.in | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/package/busybox/config/archival/Config.in b/package/busybox/config/archival/Config.in index de605ee93..104fb861e 100644 --- a/package/busybox/config/archival/Config.in +++ b/package/busybox/config/archival/Config.in @@ -195,7 +195,7 @@ config BUSYBOX_IPKG bool "ipkg" default n select BUSYBOX_MD5SUM - select BUSYBOX_WGET + depends on BUSYBOX_WGET || ADK_PACKAGE_WGET depends on ADK_TARGET_PACKAGE_IPKG help ipkg is the itsy package management system. diff --git a/package/busybox/config/networking/Config.in b/package/busybox/config/networking/Config.in index 2e0bfd36f..d755490c7 100644 --- a/package/busybox/config/networking/Config.in +++ b/package/busybox/config/networking/Config.in @@ -952,8 +952,8 @@ config BUSYBOX_VCONFIG config BUSYBOX_WGET bool "wget" - depends on !ADK_PACKAGE_WGET default y + depends on !ADK_PACKAGE_WGET help wget is a utility for non-interactive download of files from HTTP, HTTPS, and FTP servers. @@ -961,21 +961,21 @@ config BUSYBOX_WGET config BUSYBOX_FEATURE_WGET_STATUSBAR bool "Enable a nifty process meter (+2k)" default y - depends on BUSYBOX_WGET + depends on BUSYBOX_WGET && !ADK_PACKAGE_WGET help Enable the transfer progress bar for wget transfers. config BUSYBOX_FEATURE_WGET_AUTHENTICATION bool "Enable HTTP authentication" default y - depends on BUSYBOX_WGET + depends on BUSYBOX_WGET && !ADK_PACKAGE_WGET help Support authenticated HTTP transfers. config BUSYBOX_FEATURE_WGET_LONG_OPTIONS bool "Enable long options" default n - depends on BUSYBOX_WGET && BUSYBOX_LONG_OPTS + depends on BUSYBOX_WGET && BUSYBOX_LONG_OPTS && !ADK_PACKAGE_WGET help Support long options for the wget applet. |