diff options
Diffstat (limited to 'meta/recipes-core/dropbear/dropbear.inc')
-rw-r--r-- | meta/recipes-core/dropbear/dropbear.inc | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/meta/recipes-core/dropbear/dropbear.inc b/meta/recipes-core/dropbear/dropbear.inc index 526a5a045d..5af9ebd4d0 100644 --- a/meta/recipes-core/dropbear/dropbear.inc +++ b/meta/recipes-core/dropbear/dropbear.inc | |||
@@ -9,13 +9,17 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=3a5b0c2f0d0c49dfde9558ae2036683c" | |||
9 | 9 | ||
10 | DEPENDS = "zlib" | 10 | DEPENDS = "zlib" |
11 | RPROVIDES = "ssh sshd" | 11 | RPROVIDES = "ssh sshd" |
12 | DEPENDS += "${@base_contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}" | ||
12 | 13 | ||
13 | SRC_URI = "http://matt.ucc.asn.au/dropbear/releases/dropbear-${PV}.tar.gz \ | 14 | SRC_URI = "http://matt.ucc.asn.au/dropbear/releases/dropbear-${PV}.tar.gz \ |
14 | file://urandom-xauth-changes-to-options.h.patch \ | 15 | file://urandom-xauth-changes-to-options.h.patch \ |
15 | file://configure.patch \ | 16 | file://configure.patch \ |
16 | file://fix-2kb-keys.patch \ | 17 | file://fix-2kb-keys.patch \ |
17 | file://allow-nopw.patch;apply=no \ | 18 | file://allow-nopw.patch;apply=no \ |
18 | file://init" | 19 | file://init \ |
20 | ${@base_contains('DISTRO_FEATURES', 'pam', '${PAM_SRC_URI}', '', d)} " | ||
21 | |||
22 | PAM_SRC_URI = "file://dropbear-enable-pam.patch" | ||
19 | 23 | ||
20 | inherit autotools update-rc.d | 24 | inherit autotools update-rc.d |
21 | 25 | ||
@@ -28,6 +32,8 @@ LD = "${CC}" | |||
28 | SBINCOMMANDS = "dropbear dropbearkey dropbearconvert" | 32 | SBINCOMMANDS = "dropbear dropbearkey dropbearconvert" |
29 | BINCOMMANDS = "dbclient ssh scp" | 33 | BINCOMMANDS = "dbclient ssh scp" |
30 | EXTRA_OEMAKE = 'MULTI=1 SCPPROGRESS=1 PROGRAMS="${SBINCOMMANDS} ${BINCOMMANDS}"' | 34 | EXTRA_OEMAKE = 'MULTI=1 SCPPROGRESS=1 PROGRAMS="${SBINCOMMANDS} ${BINCOMMANDS}"' |
35 | EXTRA_OECONF += "\ | ||
36 | ${@base_contains('DISTRO_FEATURES', 'pam', '--enable-pam', '--disable-pam', d)}" | ||
31 | 37 | ||
32 | DISTRO_TYPE ?= "${@base_contains("IMAGE_FEATURES", "debug-tweaks", "debug", "",d)}" | 38 | DISTRO_TYPE ?= "${@base_contains("IMAGE_FEATURES", "debug-tweaks", "debug", "",d)}" |
33 | 39 | ||