diff options
| author |   Paul Eggleton <paul.eggleton@linux.intel.com> | 2013-01-16 17:00:11 +0000 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-01-18 13:01:52 +0000 |
| commit | 313039590171456b652fa7a2f5823c9b7060b20f (patch) | |
| tree | 1dccc21b6697abb0bd6bbd707aac755a8dc4a2ae /meta/recipes-core/dropbear/dropbear.inc | |
| parent | 510e377f252dece8850487c30482f83df4a89c7e (diff) | |
| download | openembedded-core-contrib-313039590171456b652fa7a2f5823c9b7060b20f.tar.gz | |
dropbear: allow configuring blank password option at runtime
Instead of using IMAGE_FEATURES to control something within a recipe,
allow this to be set at runtime, avoiding the need to rebuild dropbear
when we want to change this option.
First half of the fix for [YOCTO #2578].
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Diffstat (limited to 'meta/recipes-core/dropbear/dropbear.inc')
| -rw-r--r-- | meta/recipes-core/dropbear/dropbear.inc | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/meta/recipes-core/dropbear/dropbear.inc b/meta/recipes-core/dropbear/dropbear.inc index aa313df316..3e430f22bf 100644 --- a/meta/recipes-core/dropbear/dropbear.inc +++ b/meta/recipes-core/dropbear/dropbear.inc @@ -2,7 +2,7 @@ DESCRIPTION = "Dropbear is a lightweight SSH and SCP implementation" HOMEPAGE = "http://matt.ucc.asn.au/dropbear/dropbear.html" SECTION = "console/network" -INC_PR = "r0" +INC_PR = "r1" # some files are from other projects and have others license terms: # public domain, OpenSSH 3.5p1, OpenSSH3.6.1p2, PuTTY @@ -18,7 +18,7 @@ SRC_URI = "http://matt.ucc.asn.au/dropbear/releases/dropbear-${PV}.tar.gz \ file://dropbear-0.53.1-static_build_fix.patch \ file://configure.patch \ file://fix-2kb-keys.patch \ - ${@base_contains("DISTRO_TYPE", "debug", "file://allow-nopw.patch", "",d)} \ + file://nopw-option.patch \ file://init \ ${@base_contains('DISTRO_FEATURES', 'pam', '${PAM_SRC_URI}', '', d)} " @@ -40,8 +40,6 @@ EXTRA_OEMAKE = 'MULTI=1 SCPPROGRESS=1 PROGRAMS="${SBINCOMMANDS} ${BINCOMMANDS}"' EXTRA_OECONF += "\ ${@base_contains('DISTRO_FEATURES', 'pam', '--enable-pam', '--disable-pam', d)}" -DISTRO_TYPE ?= "${@base_contains("IMAGE_FEATURES", "debug-tweaks", "debug", "",d)}" - do_install() { install -d ${D}${sysconfdir} \ ${D}${sysconfdir}/init.d \ |