diff options
author | Otavio Salvador <otavio@ossystems.com.br> | 2014-04-24 15:59:20 -0300 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-04-25 17:19:19 +0100 |
commit | 4c14b094985216c433d330fb3d9532d4b6c91fcf (patch) | |
tree | 6970f383436ca29450779bd98c378aae89f2e079 /meta/recipes-connectivity/openssh | |
parent | 08a38a7865c41ec60f4b993b964f8d477ea0f680 (diff) | |
download | poky-4c14b094985216c433d330fb3d9532d4b6c91fcf.tar.gz |
Globally replace 'base_contains' calls with 'bb.utils.contains'
The base_contains is kept as a compatibility method and we ought to
not use it in OE-Core so we can remove it from base metadata in
future.
(From OE-Core rev: d83b16dbf0862be387f84228710cb165c6d2b03b)
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-connectivity/openssh')
-rw-r--r-- | meta/recipes-connectivity/openssh/openssh_6.5p1.bb | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/meta/recipes-connectivity/openssh/openssh_6.5p1.bb b/meta/recipes-connectivity/openssh/openssh_6.5p1.bb index 3b10164a41..b93b9ae79f 100644 --- a/meta/recipes-connectivity/openssh/openssh_6.5p1.bb +++ b/meta/recipes-connectivity/openssh/openssh_6.5p1.bb | |||
@@ -8,7 +8,7 @@ LICENSE = "BSD" | |||
8 | LIC_FILES_CHKSUM = "file://LICENCE;md5=e326045657e842541d3f35aada442507" | 8 | LIC_FILES_CHKSUM = "file://LICENCE;md5=e326045657e842541d3f35aada442507" |
9 | 9 | ||
10 | DEPENDS = "zlib openssl" | 10 | DEPENDS = "zlib openssl" |
11 | DEPENDS += "${@base_contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}" | 11 | DEPENDS += "${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}" |
12 | 12 | ||
13 | RPROVIDES_${PN}-ssh = "ssh" | 13 | RPROVIDES_${PN}-ssh = "ssh" |
14 | RPROVIDES_${PN}-sshd = "sshd" | 14 | RPROVIDES_${PN}-sshd = "sshd" |
@@ -23,7 +23,7 @@ SRC_URI = "ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-${PV}.tar. | |||
23 | file://ssh_config \ | 23 | file://ssh_config \ |
24 | file://init \ | 24 | file://init \ |
25 | file://openssh-CVE-2011-4327.patch \ | 25 | file://openssh-CVE-2011-4327.patch \ |
26 | ${@base_contains('DISTRO_FEATURES', 'pam', '${PAM_SRC_URI}', '', d)} \ | 26 | ${@bb.utils.contains('DISTRO_FEATURES', 'pam', '${PAM_SRC_URI}', '', d)} \ |
27 | file://sshd.socket \ | 27 | file://sshd.socket \ |
28 | file://sshd@.service \ | 28 | file://sshd@.service \ |
29 | file://sshdgenkeys.service \ | 29 | file://sshdgenkeys.service \ |
@@ -58,7 +58,7 @@ export LD = "${CC}" | |||
58 | 58 | ||
59 | # login path is hardcoded in sshd | 59 | # login path is hardcoded in sshd |
60 | EXTRA_OECONF = "'LOGIN_PROGRAM=${base_bindir}/login' \ | 60 | EXTRA_OECONF = "'LOGIN_PROGRAM=${base_bindir}/login' \ |
61 | ${@base_contains('DISTRO_FEATURES', 'pam', '--with-pam', '--without-pam', d)} \ | 61 | ${@bb.utils.contains('DISTRO_FEATURES', 'pam', '--with-pam', '--without-pam', d)} \ |
62 | --without-zlib-version-check \ | 62 | --without-zlib-version-check \ |
63 | --with-privsep-path=/var/run/sshd \ | 63 | --with-privsep-path=/var/run/sshd \ |
64 | --sysconfdir=${sysconfdir}/ssh \ | 64 | --sysconfdir=${sysconfdir}/ssh \ |
@@ -90,7 +90,7 @@ do_compile_append () { | |||
90 | } | 90 | } |
91 | 91 | ||
92 | do_install_append () { | 92 | do_install_append () { |
93 | if [ "${@base_contains('DISTRO_FEATURES', 'pam', 'pam', '', d)}" = "pam" ]; then | 93 | if [ "${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'pam', '', d)}" = "pam" ]; then |
94 | install -D -m 0755 ${WORKDIR}/sshd ${D}${sysconfdir}/pam.d/sshd | 94 | install -D -m 0755 ${WORKDIR}/sshd ${D}${sysconfdir}/pam.d/sshd |
95 | sed -i -e 's:#UsePAM no:UsePAM yes:' ${WORKDIR}/sshd_config ${D}${sysconfdir}/ssh/sshd_config | 95 | sed -i -e 's:#UsePAM no:UsePAM yes:' ${WORKDIR}/sshd_config ${D}${sysconfdir}/ssh/sshd_config |
96 | fi | 96 | fi |
@@ -138,7 +138,7 @@ FILES_${PN}-misc = "${bindir}/ssh* ${libexecdir}/ssh*" | |||
138 | FILES_${PN}-keygen = "${bindir}/ssh-keygen" | 138 | FILES_${PN}-keygen = "${bindir}/ssh-keygen" |
139 | 139 | ||
140 | RDEPENDS_${PN} += "${PN}-scp ${PN}-ssh ${PN}-sshd ${PN}-keygen" | 140 | RDEPENDS_${PN} += "${PN}-scp ${PN}-ssh ${PN}-sshd ${PN}-keygen" |
141 | RDEPENDS_${PN}-sshd += "${PN}-keygen ${@base_contains('DISTRO_FEATURES', 'pam', 'pam-plugin-keyinit pam-plugin-loginuid', '', d)}" | 141 | RDEPENDS_${PN}-sshd += "${PN}-keygen ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'pam-plugin-keyinit pam-plugin-loginuid', '', d)}" |
142 | RDEPENDS_${PN}-ptest += "${PN}-sftp ${PN}-misc ${PN}-sftp-server make" | 142 | RDEPENDS_${PN}-ptest += "${PN}-sftp ${PN}-misc ${PN}-sftp-server make" |
143 | 143 | ||
144 | CONFFILES_${PN}-sshd = "${sysconfdir}/ssh/sshd_config" | 144 | CONFFILES_${PN}-sshd = "${sysconfdir}/ssh/sshd_config" |