summaryrefslogtreecommitdiff
path: root/package/busybox
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2010-07-14 18:39:12 +0200
committerWaldemar Brodkorb <wbx@openadk.org>2010-07-14 18:39:12 +0200
commit29305d896b0d54c1de34204fd27de19d95e85804 (patch)
treef77d3a53ffd7e08f4eb3b432d71efb6580d3b457 /package/busybox
parent75a4099667c687fc96211e12f8d8810b94c9d172 (diff)
misc stuff
- remove broken patch from silicon motion driver - add mpc package for upcoming gcc 4.5.x update - add /etc/adktarget, which can be used for native targets to identify - add ffplay subpackage
Diffstat (limited to 'package/busybox')
-rw-r--r--package/busybox/config/archival/Config.in2
-rw-r--r--package/busybox/config/networking/Config.in8
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.