Commit a7e78f97 authored by Alexander Clouter's avatar Alexander Clouter Committed by Peter Korsgaard
Browse files

dropbear: disable zlib support when built with small option 



Closes #3733

Signed-off-by: default avatarAlexander Clouter <alex@digriz.org.uk>
Signed-off-by: default avatarPeter Korsgaard <jacmet@sunsite.dk>
parent 017e3061

CHANGES

+1 −0
Original line number Diff line number Diff line
@@ -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:

package/dropbear/Config.in

+2 −2
Original line number Diff line number Diff line 
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.

package/dropbear/dropbear.mk

+2 −1
Original line number Diff line number Diff line
@@ -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