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:10:58 +0100 |
| commit | d83b16dbf0862be387f84228710cb165c6d2b03b (patch) | |
| tree | 37a594f2efa42513359e45477ab0b69857226563 /meta/recipes-extended/sudo | |
| parent | 93499ebc46547f5bf6dcecd5a786ead9f726de28 (diff) | |
| download | openembedded-core-d83b16dbf0862be387f84228710cb165c6d2b03b.tar.gz openembedded-core-d83b16dbf0862be387f84228710cb165c6d2b03b.tar.bz2 openembedded-core-d83b16dbf0862be387f84228710cb165c6d2b03b.zip | |
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.
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-extended/sudo')
| -rw-r--r-- | meta/recipes-extended/sudo/sudo_1.8.9p5.bb | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/meta/recipes-extended/sudo/sudo_1.8.9p5.bb b/meta/recipes-extended/sudo/sudo_1.8.9p5.bb index b4d18e88ff..7851473e47 100644 --- a/meta/recipes-extended/sudo/sudo_1.8.9p5.bb +++ b/meta/recipes-extended/sudo/sudo_1.8.9p5.bb @@ -1,20 +1,20 @@ require sudo.inc SRC_URI = "http://ftp.sudo.ws/sudo/dist/sudo-${PV}.tar.gz \ - ${@base_contains('DISTRO_FEATURES', 'pam', '${PAM_SRC_URI}', '', d)}" + ${@bb.utils.contains('DISTRO_FEATURES', 'pam', '${PAM_SRC_URI}', '', d)}" PAM_SRC_URI = "file://sudo.pam" SRC_URI[md5sum] = "d3f1f1cfca6b2b06b048e1abb7d0227e" SRC_URI[sha256sum] = "bc9d5c96de5f8b4d2b014f87a37870aef60d2891c869202454069150a21a5c21" -DEPENDS += " ${@base_contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}" -RDEPENDS_${PN} += " ${@base_contains('DISTRO_FEATURES', 'pam', 'pam-plugin-limits pam-plugin-keyinit', '', d)}" +DEPENDS += " ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}" +RDEPENDS_${PN} += " ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'pam-plugin-limits pam-plugin-keyinit', '', d)}" -EXTRA_OECONF += " ${@base_contains('DISTRO_FEATURES', 'pam', '--with-pam', '--without-pam', d)}" +EXTRA_OECONF += " ${@bb.utils.contains('DISTRO_FEATURES', 'pam', '--with-pam', '--without-pam', d)}" do_install_append () { - if [ "${@base_contains('DISTRO_FEATURES', 'pam', 'pam', '', d)}" = "pam" ]; then + if [ "${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'pam', '', d)}" = "pam" ]; then install -D -m 664 ${WORKDIR}/sudo.pam ${D}/${sysconfdir}/pam.d/sudo fi |