summaryrefslogtreecommitdiff
path: root/package/busybox
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2014-04-02 07:37:27 +0200
committerWaldemar Brodkorb <wbx@openadk.org>2014-04-02 07:37:27 +0200
commit7236e468162b3af51c0acecad10fbef1838c06ad (patch)
tree9c8027cf769aaa7ef7f0a6330b34d7666238b920 /package/busybox
parenta691abc857458de0023f5e532feee866af0218ed (diff)
parent309f13ab6858e1c1639814e210a6c86380ca717b (diff)
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'package/busybox')
-rw-r--r--package/busybox/Makefile1
-rw-r--r--package/busybox/config/Config.in1
-rw-r--r--package/busybox/config/util-linux/Config.in2
3 files changed, 3 insertions, 1 deletions
diff --git a/package/busybox/Makefile b/package/busybox/Makefile
index c1923708e..fce16fa32 100644
--- a/package/busybox/Makefile
+++ b/package/busybox/Makefile
@@ -9,6 +9,7 @@ PKG_RELEASE:= 5
PKG_MD5SUM:= 795394f83903b5eec6567d51eebb417e
PKG_DESCR:= core utilities for embedded systems
PKG_SECTION:= base
+PKG_BUILDDEP:= bzip2-host
PKG_URL:= http://www.busybox.net/
PKG_SITES:= http://www.busybox.net/downloads/
diff --git a/package/busybox/config/Config.in b/package/busybox/config/Config.in
index 3a5e340ae..40f67caa7 100644
--- a/package/busybox/config/Config.in
+++ b/package/busybox/config/Config.in
@@ -454,6 +454,7 @@ menu 'Build Options'
config BUSYBOX_STATIC
bool "Build BusyBox as a static binary (no shared libs)"
+ default y if ADK_STATIC
default n
help
If you want to build a static BusyBox binary, which does not
diff --git a/package/busybox/config/util-linux/Config.in b/package/busybox/config/util-linux/Config.in
index aafc795b1..026146662 100644
--- a/package/busybox/config/util-linux/Config.in
+++ b/package/busybox/config/util-linux/Config.in
@@ -572,7 +572,7 @@ config BUSYBOX_FEATURE_MOUNT_NFS
config BUSYBOX_FEATURE_MOUNT_CIFS
bool "Support mounting CIFS/SMB file systems"
- default y
+ default n
depends on BUSYBOX_MOUNT
help
Enable support for samba mounts.