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>
This commit is contained in:
Alexander Clouter 2011-05-16 22:41:54 +02:00 committed by Peter Korsgaard
parent 017e3061fd
commit a7e78f974e
3 changed files with 5 additions and 3 deletions

View File

@ -23,6 +23,7 @@
#3541: Quotes in the top Makefile:217 break buildroot/kernel config... #3541: Quotes in the top Makefile:217 break buildroot/kernel config...
#3571: u-boot: fw_printenv does not build #3571: u-boot: fw_printenv does not build
#3643: popt source url is not responding #3643: popt source url is not responding
#3733: dropbear: make zlib optional
2011.02, Released February 28th, 2011: 2011.02, Released February 28th, 2011:

View File

@ -1,6 +1,6 @@
config BR2_PACKAGE_DROPBEAR config BR2_PACKAGE_DROPBEAR
bool "dropbear" bool "dropbear"
select BR2_PACKAGE_ZLIB select BR2_PACKAGE_ZLIB if !BR2_PACKAGE_DROPBEAR_SMALL
help help
A small SSH 2 server designed for small memory environments. 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. Compile dropbear for the smallest possible binary size.
Tradeoffs are slower hashes and ciphers, and disabling of the Tradeoffs are slower hashes and ciphers, and disabling of the
blowfish cipher. blowfish cipher and zlib.

View File

@ -7,7 +7,6 @@
DROPBEAR_VERSION = 0.53.1 DROPBEAR_VERSION = 0.53.1
DROPBEAR_SOURCE = dropbear-$(DROPBEAR_VERSION).tar.gz DROPBEAR_SOURCE = dropbear-$(DROPBEAR_VERSION).tar.gz
DROPBEAR_SITE = http://matt.ucc.asn.au/dropbear/releases DROPBEAR_SITE = http://matt.ucc.asn.au/dropbear/releases
DROPBEAR_DEPENDENCIES = zlib
DROPBEAR_TARGET_BINS = dbclient dropbearkey dropbearconvert scp ssh DROPBEAR_TARGET_BINS = dbclient dropbearkey dropbearconvert scp ssh
DROPBEAR_MAKE = $(MAKE) MULTI=1 SCPPROGRESS=1 \ DROPBEAR_MAKE = $(MAKE) MULTI=1 SCPPROGRESS=1 \
PROGRAMS="dropbear dbclient dropbearkey dropbearconvert scp" PROGRAMS="dropbear dbclient dropbearkey dropbearconvert scp"
@ -41,8 +40,10 @@ endif
ifeq ($(BR2_PACKAGE_DROPBEAR_SMALL),y) ifeq ($(BR2_PACKAGE_DROPBEAR_SMALL),y)
DROPBEAR_POST_EXTRACT_HOOKS += DROPBEAR_BUILD_SMALL DROPBEAR_POST_EXTRACT_HOOKS += DROPBEAR_BUILD_SMALL
DROPBEAR_CONF_OPT += --disable-zlib
else else
DROPBEAR_POST_EXTRACT_HOOKS += DROPBEAR_BUILD_FEATURED DROPBEAR_POST_EXTRACT_HOOKS += DROPBEAR_BUILD_FEATURED
DROPBEAR_DEPENDENCIES += zlib
endif endif
define DROPBEAR_INSTALL_TARGET_CMDS define DROPBEAR_INSTALL_TARGET_CMDS