summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndre McCurdy <armccurdy@gmail.com>2016-09-16 15:29:12 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-09-20 15:11:08 +0100
commitf5062f0dec942dff4868a0130718aec486e9022e (patch)
tree7b0fbdf6a58dd30976ad5adaab42647ab76a8d2d
parent472c245cfe7d6173eaa2359bab5952439d54eef0 (diff)
downloadpoky-f5062f0dec942dff4868a0130718aec486e9022e.tar.gz
dropbear: deterministic selection of system -vs- bundled libtom libs
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. (From OE-Core rev: b7c2edd2d6ded287d8b34dd047ae84d3fd69d4c6) Signed-off-by: Andre McCurdy <armccurdy@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-core/dropbear/dropbear.inc4
1 files changed, 4 insertions, 0 deletions
diff --git a/meta/recipes-core/dropbear/dropbear.inc b/meta/recipes-core/dropbear/dropbear.inc
index cdac7ec99d..bda7eb847c 100644
--- a/meta/recipes-core/dropbear/dropbear.inc
+++ b/meta/recipes-core/dropbear/dropbear.inc
@@ -45,6 +45,10 @@ SYSTEMD_SERVICE_${PN} = "dropbear.socket"
45SBINCOMMANDS = "dropbear dropbearkey dropbearconvert" 45SBINCOMMANDS = "dropbear dropbearkey dropbearconvert"
46BINCOMMANDS = "dbclient ssh scp" 46BINCOMMANDS = "dbclient ssh scp"
47EXTRA_OEMAKE = 'MULTI=1 SCPPROGRESS=1 PROGRAMS="${SBINCOMMANDS} ${BINCOMMANDS}"' 47EXTRA_OEMAKE = 'MULTI=1 SCPPROGRESS=1 PROGRAMS="${SBINCOMMANDS} ${BINCOMMANDS}"'
48
49PACKAGECONFIG ?= ""
50PACKAGECONFIG[system-libtom] = "--disable-bundled-libtom,--enable-bundled-libtom,libtommath libtomcrypt"
51
48EXTRA_OECONF += "\ 52EXTRA_OECONF += "\
49 ${@bb.utils.contains('DISTRO_FEATURES', 'pam', '--enable-pam', '--disable-pam', d)}" 53 ${@bb.utils.contains('DISTRO_FEATURES', 'pam', '--enable-pam', '--disable-pam', d)}"
50 54