dropbear: unbundle libtomath & libtomcrypt
authorFrancois Perrad <fperrad@gmail.com>
Wed, 28 Mar 2018 08:38:27 +0000 (10:38 +0200)
committerThomas Petazzoni <thomas.petazzoni@bootlin.com>
Sat, 28 Apr 2018 15:38:11 +0000 (17:38 +0200)
DROPBEAR_SMALL_CODE could be only honored with bundled libtomcrypt

Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
package/dropbear/Config.in
package/dropbear/dropbear.mk

index 6700778161baa5f13686890ce7884e6f4d9d7492..5d6b83b6d1c0713386db47f7513337b7cf177b79 100644 (file)
@@ -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.
 
index 10cb99b5e4ad997f6cfdb2f94958be04124a7214..1da1a559a30a5e1e776185d5dd1635fc2629b51c 100644 (file)
@@ -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)