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-support/consolekit | |
| parent | 08a38a7865c41ec60f4b993b964f8d477ea0f680 (diff) | |
| download | openembedded-core-contrib-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-support/consolekit')
| -rw-r--r-- | meta/recipes-support/consolekit/consolekit_0.4.6.bb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/meta/recipes-support/consolekit/consolekit_0.4.6.bb b/meta/recipes-support/consolekit/consolekit_0.4.6.bb index c97b4498f7..98516166cf 100644 --- a/meta/recipes-support/consolekit/consolekit_0.4.6.bb +++ b/meta/recipes-support/consolekit/consolekit_0.4.6.bb @@ -19,8 +19,8 @@ SRC_URI[sha256sum] = "b41d17e06f80059589fbeefe96ad07bcc564c49e65516da1caf9751464 S = "${WORKDIR}/ConsoleKit-${PV}" -PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'pam', 'pam', '', d)} \ - ${@base_contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)}" +PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'pam', '', d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)}" PACKAGECONFIG[pam] = "--enable-pam-module --with-pam-module-dir=${base_libdir}/security,--disable-pam-module,libpam" # No option to turn it on or off, so rely on the build dependency for now. @@ -37,7 +37,7 @@ FILES_pam-plugin-ck-connector += "${base_libdir}/security/*.so" RDEPENDS_pam-plugin-ck-connector += "${PN}" do_install_append() { - if ${@base_contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then + if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then install -d ${D}${sysconfdir}/tmpfiles.d echo "d ${localstatedir}/log/ConsoleKit - - - -" \ > ${D}${sysconfdir}/tmpfiles.d/consolekit.conf |