diff options
| author |   Ross Burton <ross.burton@intel.com> | 2016-04-22 20:48:54 +0100 |
|---|---|---|
| committer |   Armin Kuster <akuster808@gmail.com> | 2016-05-02 14:03:03 -0700 |
| commit | 33837ef82ade4d2b04f32e263c42538b19ca59ae (patch) | |
| tree | dbdb13f795f6079b87068246806ae9e37c02d9f3 | |
| parent | d336edb5d2d0013530ab55cfb9709dd10d529e86 (diff) | |
| download | meta-openembedded-contrib-33837ef82ade4d2b04f32e263c42538b19ca59ae.tar.gz | |
meta-efl: 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>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
| -rw-r--r-- | meta-efl/recipes-efl/e17/e-wm.inc | 4 | ||||
| -rw-r--r-- | meta-efl/recipes-efl/efl/entrance_svn.bb | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/meta-efl/recipes-efl/e17/e-wm.inc b/meta-efl/recipes-efl/e17/e-wm.inc index 45637f366e..444ec89593 100644 --- a/meta-efl/recipes-efl/e17/e-wm.inc +++ b/meta-efl/recipes-efl/e17/e-wm.inc @@ -7,8 +7,8 @@ SRCNAME = "e" inherit e update-alternatives gettext pkgconfig S = "${WORKDIR}/${SRCNAME}" -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,--disable-pam,libpam" PACKAGECONFIG[systemd] = "--enable-systemd,--disable-systemd,systemd" diff --git a/meta-efl/recipes-efl/efl/entrance_svn.bb b/meta-efl/recipes-efl/efl/entrance_svn.bb index 337473705d..2888dc8dc1 100644 --- a/meta-efl/recipes-efl/efl/entrance_svn.bb +++ b/meta-efl/recipes-efl/efl/entrance_svn.bb @@ -16,7 +16,7 @@ PNBLACKLIST[entrance] ?= "broken: switch to https://git.enlightenment.org/misc/e PACKAGECONFIG ??= "" PACKAGECONFIG[consolekit] = "--enable-consolekit,--disable-consolekit,consolekit" -EXTRA_OECONF = "--with-edje-cc=${STAGING_BINDIR_NATIVE}/edje_cc ${@base_contains('DISTRO_FEATURES', 'pam', '', '--disable-pam', d)}" +EXTRA_OECONF = "--with-edje-cc=${STAGING_BINDIR_NATIVE}/edje_cc ${@bb.utils.contains('DISTRO_FEATURES', 'pam', '', '--disable-pam', d)}" PR = "r7" PV = "0.0.4+svnr${SRCPV}" |