diff options
| author | Ross Burton <ross.burton@intel.com> | 2016-04-22 20:48:49 +0100 |
|---|---|---|
| committer | Martin Jansa <Martin.Jansa@gmail.com> | 2016-04-28 10:38:38 +0200 |
| commit | 21f10c11f39020f9502d741c774a12d1aeb39499 (patch) | |
| tree | fdc66c039950da89d82b6b7405ebfc50cbba693a /meta-oe/recipes-extended/polkit | |
| parent | 723b55f5c1f7df21dbcfa7cb2dcaecb10d886041 (diff) | |
| download | meta-openembedded-21f10c11f39020f9502d741c774a12d1aeb39499.tar.gz | |
meta-oe: use bb.utils.contains() instead of base_contains()
base_contains() is a compatibility wrapper and may warn in the future, so
replace all instances with bb.utils.contains().
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'meta-oe/recipes-extended/polkit')
| -rw-r--r-- | meta-oe/recipes-extended/polkit/polkit_0.113.bb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/meta-oe/recipes-extended/polkit/polkit_0.113.bb b/meta-oe/recipes-extended/polkit/polkit_0.113.bb index aab4f549dc..fdd198a61d 100644 --- a/meta-oe/recipes-extended/polkit/polkit_0.113.bb +++ b/meta-oe/recipes-extended/polkit/polkit_0.113.bb | |||
| @@ -9,8 +9,8 @@ DEPENDS = "expat glib-2.0 intltool-native mozjs" | |||
| 9 | 9 | ||
| 10 | inherit autotools gtk-doc pkgconfig useradd systemd gobject-introspection | 10 | inherit autotools gtk-doc pkgconfig useradd systemd gobject-introspection |
| 11 | 11 | ||
| 12 | PACKAGECONFIG = "${@base_contains('DISTRO_FEATURES', 'pam', 'pam', '', d)} \ | 12 | PACKAGECONFIG = "${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'pam', '', d)} \ |
| 13 | ${@base_contains('DISTRO_FEATURES','systemd','systemd','consolekit',d)}" | 13 | ${@bb.utils.contains('DISTRO_FEATURES','systemd','systemd','consolekit',d)}" |
| 14 | 14 | ||
| 15 | PACKAGECONFIG[pam] = "--with-authfw=pam,--with-authfw=shadow,libpam,libpam" | 15 | PACKAGECONFIG[pam] = "--with-authfw=pam,--with-authfw=shadow,libpam,libpam" |
| 16 | PACKAGECONFIG[systemd] = "--enable-libsystemd-login=yes --with-systemdsystemunitdir=${systemd_unitdir}/system/,--enable-libsystemd-login=no --with-systemdsystemunitdir=,systemd" | 16 | PACKAGECONFIG[systemd] = "--enable-libsystemd-login=yes --with-systemdsystemunitdir=${systemd_unitdir}/system/,--enable-libsystemd-login=no --with-systemdsystemunitdir=,systemd" |
| @@ -20,7 +20,7 @@ PACKAGECONFIG[consolekit] = ",,,consolekit" | |||
| 20 | PAM_SRC_URI = "file://polkit-1_pam.patch" | 20 | PAM_SRC_URI = "file://polkit-1_pam.patch" |
| 21 | SRC_URI = "http://www.freedesktop.org/software/polkit/releases/polkit-${PV}.tar.gz \ | 21 | SRC_URI = "http://www.freedesktop.org/software/polkit/releases/polkit-${PV}.tar.gz \ |
| 22 | file://0001-make-netgroup-support-configurable.patch \ | 22 | file://0001-make-netgroup-support-configurable.patch \ |
| 23 | ${@base_contains('DISTRO_FEATURES', 'pam', '${PAM_SRC_URI}', '', d)} \ | 23 | ${@bb.utils.contains('DISTRO_FEATURES', 'pam', '${PAM_SRC_URI}', '', d)} \ |
| 24 | " | 24 | " |
| 25 | SRC_URI[md5sum] = "4b77776c9e4f897dcfe03b2c34198edf" | 25 | SRC_URI[md5sum] = "4b77776c9e4f897dcfe03b2c34198edf" |
| 26 | SRC_URI[sha256sum] = "e1c095093c654951f78f8618d427faf91cf62abdefed98de40ff65eca6413c81" | 26 | SRC_URI[sha256sum] = "e1c095093c654951f78f8618d427faf91cf62abdefed98de40ff65eca6413c81" |
