From 2450968021e8d4799eecbf3feeecec76c774a68b Mon Sep 17 00:00:00 2001 From: Francois Perrad Date: Wed, 28 Mar 2018 10:38:27 +0200 Subject: [PATCH] dropbear: unbundle libtomath & libtomcrypt DROPBEAR_SMALL_CODE could be only honored with bundled libtomcrypt Signed-off-by: Francois Perrad Signed-off-by: Thomas Petazzoni (cherry picked from commit cf9b5522d1f8488b1c7e74822eff9f3ac69d8821) Signed-off-by: Peter Korsgaard --- package/dropbear/Config.in | 1 + package/dropbear/dropbear.mk | 5 +++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/package/dropbear/Config.in b/package/dropbear/Config.in index 6700778161..5d6b83b6d1 100644 --- a/package/dropbear/Config.in +++ b/package/dropbear/Config.in @@ -1,6 +1,7 @@ config BR2_PACKAGE_DROPBEAR bool "dropbear" select BR2_PACKAGE_ZLIB if !BR2_PACKAGE_DROPBEAR_SMALL + select BR2_PACKAGE_LIBTOMCRYPT if !BR2_PACKAGE_DROPBEAR_SMALL help A small SSH 2 server designed for small memory environments. diff --git a/package/dropbear/dropbear.mk b/package/dropbear/dropbear.mk index 10cb99b5e4..1da1a559a3 100644 --- a/package/dropbear/dropbear.mk +++ b/package/dropbear/dropbear.mk @@ -76,10 +76,11 @@ DROPBEAR_POST_EXTRACT_HOOKS += DROPBEAR_ENABLE_REVERSE_DNS endif ifeq ($(BR2_PACKAGE_DROPBEAR_SMALL),y) -DROPBEAR_CONF_OPTS += --disable-zlib +DROPBEAR_CONF_OPTS += --disable-zlib --enable-bundled-libtom else DROPBEAR_POST_EXTRACT_HOOKS += DROPBEAR_BUILD_FEATURED -DROPBEAR_DEPENDENCIES += zlib +DROPBEAR_DEPENDENCIES += zlib libtomcrypt +DROPBEAR_CONF_OPTS += --disable-bundled-libtom endif ifneq ($(BR2_PACKAGE_DROPBEAR_WTMP),y)