diff options
Diffstat (limited to 'meta/recipes-core/dropbear/dropbear.inc')
-rw-r--r-- | meta/recipes-core/dropbear/dropbear.inc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/meta/recipes-core/dropbear/dropbear.inc b/meta/recipes-core/dropbear/dropbear.inc index 40ed9d261d..5a7be492b7 100644 --- a/meta/recipes-core/dropbear/dropbear.inc +++ b/meta/recipes-core/dropbear/dropbear.inc | |||
@@ -10,7 +10,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=4d290ce0ac102c828dfc9ce836784688" | |||
10 | DEPENDS = "zlib" | 10 | DEPENDS = "zlib" |
11 | RPROVIDES_${PN} = "ssh sshd" | 11 | RPROVIDES_${PN} = "ssh sshd" |
12 | 12 | ||
13 | DEPENDS += "${@base_contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}" | 13 | DEPENDS += "${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}" |
14 | 14 | ||
15 | SRC_URI = "http://matt.ucc.asn.au/dropbear/releases/dropbear-${PV}.tar.bz2 \ | 15 | SRC_URI = "http://matt.ucc.asn.au/dropbear/releases/dropbear-${PV}.tar.bz2 \ |
16 | file://0001-urandom-xauth-changes-to-options.h.patch \ | 16 | file://0001-urandom-xauth-changes-to-options.h.patch \ |
@@ -21,7 +21,7 @@ SRC_URI = "http://matt.ucc.asn.au/dropbear/releases/dropbear-${PV}.tar.bz2 \ | |||
21 | file://dropbearkey.service \ | 21 | file://dropbearkey.service \ |
22 | file://dropbear@.service \ | 22 | file://dropbear@.service \ |
23 | file://dropbear.socket \ | 23 | file://dropbear.socket \ |
24 | ${@base_contains('DISTRO_FEATURES', 'pam', '${PAM_SRC_URI}', '', d)} " | 24 | ${@bb.utils.contains('DISTRO_FEATURES', 'pam', '${PAM_SRC_URI}', '', d)} " |
25 | 25 | ||
26 | PAM_SRC_URI = "file://0005-dropbear-enable-pam.patch \ | 26 | PAM_SRC_URI = "file://0005-dropbear-enable-pam.patch \ |
27 | file://0006-dropbear-configuration-file.patch \ | 27 | file://0006-dropbear-configuration-file.patch \ |
@@ -41,7 +41,7 @@ SBINCOMMANDS = "dropbear dropbearkey dropbearconvert" | |||
41 | BINCOMMANDS = "dbclient ssh scp" | 41 | BINCOMMANDS = "dbclient ssh scp" |
42 | EXTRA_OEMAKE = 'MULTI=1 SCPPROGRESS=1 PROGRAMS="${SBINCOMMANDS} ${BINCOMMANDS}"' | 42 | EXTRA_OEMAKE = 'MULTI=1 SCPPROGRESS=1 PROGRAMS="${SBINCOMMANDS} ${BINCOMMANDS}"' |
43 | EXTRA_OECONF += "\ | 43 | EXTRA_OECONF += "\ |
44 | ${@base_contains('DISTRO_FEATURES', 'pam', '--enable-pam', '--disable-pam', d)}" | 44 | ${@bb.utils.contains('DISTRO_FEATURES', 'pam', '--enable-pam', '--disable-pam', d)}" |
45 | CFLAGS += "-DSFTPSERVER_PATH=\\"${libdir}/openssh/sftp-server\\"" | 45 | CFLAGS += "-DSFTPSERVER_PATH=\\"${libdir}/openssh/sftp-server\\"" |
46 | 46 | ||
47 | do_install() { | 47 | do_install() { |
@@ -66,7 +66,7 @@ do_install() { | |||
66 | -e 's,/usr/bin,${bindir},g' \ | 66 | -e 's,/usr/bin,${bindir},g' \ |
67 | -e 's,/usr,${prefix},g' > ${D}${sysconfdir}/init.d/dropbear | 67 | -e 's,/usr,${prefix},g' > ${D}${sysconfdir}/init.d/dropbear |
68 | chmod 755 ${D}${sysconfdir}/init.d/dropbear | 68 | chmod 755 ${D}${sysconfdir}/init.d/dropbear |
69 | if [ "${@base_contains('DISTRO_FEATURES', 'pam', 'pam', '', d)}" = "pam" ]; then | 69 | if [ "${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'pam', '', d)}" = "pam" ]; then |
70 | install -d ${D}${sysconfdir}/pam.d | 70 | install -d ${D}${sysconfdir}/pam.d |
71 | install -m 0644 ${WORKDIR}/dropbear ${D}${sysconfdir}/pam.d/ | 71 | install -m 0644 ${WORKDIR}/dropbear ${D}${sysconfdir}/pam.d/ |
72 | fi | 72 | fi |