| Message ID | 20180328083827.31540-2-francois.perrad@gadz.org |
|---|---|
| State | Accepted |
| Headers | show |
| Series | [V4,1/2] dropbear: bump to version 2018.76 | expand |
Hello, On Wed, 28 Mar 2018 10:38:27 +0200, Francois Perrad wrote: > DROPBEAR_SMALL_CODE could be only honored with bundled libtomcrypt > > Signed-off-by: Francois Perrad <francois.perrad@gadz.org> > --- > package/dropbear/Config.in | 1 + > package/dropbear/dropbear.mk | 5 +++-- > 2 files changed, 4 insertions(+), 2 deletions(-) Applied to master, thanks. The fact that it's only done with static libraries (libtommath and libtomcrypt are only compiled as static libraries) and only for the !small case make this pretty "specific", but OK. Thanks! Thomas
diff --git a/package/dropbear/Config.in b/package/dropbear/Config.in index 670077816..5d6b83b6d 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 25859a382..fa6ee8bd0 100644 --- a/package/dropbear/dropbear.mk +++ b/package/dropbear/dropbear.mk @@ -71,10 +71,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)
DROPBEAR_SMALL_CODE could be only honored with bundled libtomcrypt Signed-off-by: Francois Perrad <francois.perrad@gadz.org> --- package/dropbear/Config.in | 1 + package/dropbear/dropbear.mk | 5 +++-- 2 files changed, 4 insertions(+), 2 deletions(-)