summaryrefslogtreecommitdiffstats
path: root/meta/recipes-support/consolekit
diff options
context:
space:
mode:
authorOtavio Salvador <otavio@ossystems.com.br>2014-04-24 15:59:20 -0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-04-25 17:19:19 +0100
commit4c14b094985216c433d330fb3d9532d4b6c91fcf (patch)
tree6970f383436ca29450779bd98c378aae89f2e079 /meta/recipes-support/consolekit
parent08a38a7865c41ec60f4b993b964f8d477ea0f680 (diff)
downloadpoky-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.bb6
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
19 19
20S = "${WORKDIR}/ConsoleKit-${PV}" 20S = "${WORKDIR}/ConsoleKit-${PV}"
21 21
22PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'pam', 'pam', '', d)} \ 22PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'pam', '', d)} \
23 ${@base_contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)}" 23 ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)}"
24 24
25PACKAGECONFIG[pam] = "--enable-pam-module --with-pam-module-dir=${base_libdir}/security,--disable-pam-module,libpam" 25PACKAGECONFIG[pam] = "--enable-pam-module --with-pam-module-dir=${base_libdir}/security,--disable-pam-module,libpam"
26# No option to turn it on or off, so rely on the build dependency for now. 26# 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"
37RDEPENDS_pam-plugin-ck-connector += "${PN}" 37RDEPENDS_pam-plugin-ck-connector += "${PN}"
38 38
39do_install_append() { 39do_install_append() {
40 if ${@base_contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then 40 if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then
41 install -d ${D}${sysconfdir}/tmpfiles.d 41 install -d ${D}${sysconfdir}/tmpfiles.d
42 echo "d ${localstatedir}/log/ConsoleKit - - - -" \ 42 echo "d ${localstatedir}/log/ConsoleKit - - - -" \
43 > ${D}${sysconfdir}/tmpfiles.d/consolekit.conf 43 > ${D}${sysconfdir}/tmpfiles.d/consolekit.conf