]> code.ossystems Code Review - openembedded-core.git/commitdiff
dropbear: deterministic selection of system -vs- bundled libtom libs
authorAndre McCurdy <armccurdy@gmail.com>
Fri, 16 Sep 2016 22:29:12 +0000 (15:29 -0700)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Mon, 19 Sep 2016 22:57:20 +0000 (23:57 +0100)
Dropbear will use system versions of libtommath and libtomcrypt if
available. To make builds deterministic, add a PACKAGECONFIG option
to choose system libs or force use of the bundled versions.

Note that currently there are no libtommath or libtomcrypt recipes
in oe-core, so default to using the bundled versions.

Signed-off-by: Andre McCurdy <armccurdy@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
meta/recipes-core/dropbear/dropbear.inc

index cdac7ec99da448bd438ac7e85ff81de5d030f01e..bda7eb847c1669e725f4c316d91cbdb4549f550a 100644 (file)
@@ -45,6 +45,10 @@ SYSTEMD_SERVICE_${PN} = "dropbear.socket"
 SBINCOMMANDS = "dropbear dropbearkey dropbearconvert"
 BINCOMMANDS = "dbclient ssh scp"
 EXTRA_OEMAKE = 'MULTI=1 SCPPROGRESS=1 PROGRAMS="${SBINCOMMANDS} ${BINCOMMANDS}"'
+
+PACKAGECONFIG ?= ""
+PACKAGECONFIG[system-libtom] = "--disable-bundled-libtom,--enable-bundled-libtom,libtommath libtomcrypt"
+
 EXTRA_OECONF += "\
  ${@bb.utils.contains('DISTRO_FEATURES', 'pam', '--enable-pam', '--disable-pam', d)}"