dropbear: disable zlib support when built with small option
Closes #3733
Signed-off-by: Alexander Clouter <alex@digriz.org.uk>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
diff --git a/CHANGES b/CHANGES
index 3678d23..a60a898 100644
--- a/CHANGES
+++ b/CHANGES
@@ -23,6 +23,7 @@
#3541: Quotes in the top Makefile:217 break buildroot/kernel config...
#3571: u-boot: fw_printenv does not build
#3643: popt source url is not responding
+ #3733: dropbear: make zlib optional
2011.02, Released February 28th, 2011:
diff --git a/package/dropbear/Config.in b/package/dropbear/Config.in
index 4bc0e3e..c30228f 100644
--- a/package/dropbear/Config.in
+++ b/package/dropbear/Config.in
@@ -1,6 +1,6 @@
config BR2_PACKAGE_DROPBEAR
bool "dropbear"
- select BR2_PACKAGE_ZLIB
+ select BR2_PACKAGE_ZLIB if !BR2_PACKAGE_DROPBEAR_SMALL
help
A small SSH 2 server designed for small memory environments.
@@ -22,4 +22,4 @@
Compile dropbear for the smallest possible binary size.
Tradeoffs are slower hashes and ciphers, and disabling of the
- blowfish cipher.
+ blowfish cipher and zlib.
diff --git a/package/dropbear/dropbear.mk b/package/dropbear/dropbear.mk
index d73e993..6ef5dec 100644
--- a/package/dropbear/dropbear.mk
+++ b/package/dropbear/dropbear.mk
@@ -7,7 +7,6 @@
DROPBEAR_VERSION = 0.53.1
DROPBEAR_SOURCE = dropbear-$(DROPBEAR_VERSION).tar.gz
DROPBEAR_SITE = http://matt.ucc.asn.au/dropbear/releases
-DROPBEAR_DEPENDENCIES = zlib
DROPBEAR_TARGET_BINS = dbclient dropbearkey dropbearconvert scp ssh
DROPBEAR_MAKE = $(MAKE) MULTI=1 SCPPROGRESS=1 \
PROGRAMS="dropbear dbclient dropbearkey dropbearconvert scp"
@@ -41,8 +40,10 @@
ifeq ($(BR2_PACKAGE_DROPBEAR_SMALL),y)
DROPBEAR_POST_EXTRACT_HOOKS += DROPBEAR_BUILD_SMALL
+DROPBEAR_CONF_OPT += --disable-zlib
else
DROPBEAR_POST_EXTRACT_HOOKS += DROPBEAR_BUILD_FEATURED
+DROPBEAR_DEPENDENCIES += zlib
endif
define DROPBEAR_INSTALL_TARGET_CMDS