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 3678d235efa822204077f6ed517280ae7830a68d..a60a898b4938913434ba7669a980113ed0b05143 100644 (file)
--- 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 4bc0e3e1b0f7c66a2898f0be0d2fce788eca3591..c30228f202b0f5b06b9de6b981a304e86ac67ab2 100644 (file)
--- 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 @@ config BR2_PACKAGE_DROPBEAR_SMALL
          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 d73e9934667bdeb31a0aaec219a4f436e3687214..6ef5dec44e2dfc78c6a2e7ce111d3469bacd2b22 100644 (file)
--- 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 @@ endif
 
 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