From 0c31f55bcfd6630d894dd2dda6ca483bea5de4ab Mon Sep 17 00:00:00 2001 From: Peter Kjellerstedt Date: Wed, 1 Mar 2017 18:30:49 +0100 Subject: Make use of the new bb.utils.filter() function Signed-off-by: Peter Kjellerstedt Signed-off-by: Martin Jansa --- meta-efl/recipes-efl/e17/e-wm.inc | 4 +--- meta-efl/recipes-efl/efl/efl.inc | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) (limited to 'meta-efl') diff --git a/meta-efl/recipes-efl/e17/e-wm.inc b/meta-efl/recipes-efl/e17/e-wm.inc index 444ec89593..a6e964b550 100644 --- a/meta-efl/recipes-efl/e17/e-wm.inc +++ b/meta-efl/recipes-efl/e17/e-wm.inc @@ -7,12 +7,10 @@ SRCNAME = "e" inherit e update-alternatives gettext pkgconfig S = "${WORKDIR}/${SRCNAME}" -PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'pam', '', d)} \ - ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)}" +PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'pam systemd', d)}" PACKAGECONFIG[pam] = "--enable-pam,--disable-pam,libpam" PACKAGECONFIG[systemd] = "--enable-systemd,--disable-systemd,systemd" - EXTRA_OECONF = "\ --with-edje-cc=${STAGING_BINDIR_NATIVE}/edje_cc \ --with-eet-eet=${STAGING_BINDIR_NATIVE}/eet \ diff --git a/meta-efl/recipes-efl/efl/efl.inc b/meta-efl/recipes-efl/efl/efl.inc index 5436b40dd0..59ae8d75a2 100644 --- a/meta-efl/recipes-efl/efl/efl.inc +++ b/meta-efl/recipes-efl/efl/efl.inc @@ -51,7 +51,7 @@ EXTRA_OECONF_append_class-native = " \ --disable-image-loader-dds \ " -PACKAGECONFIG ?= "egl opengl-es gstreamer1 pulseaudio luajit ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'wayland', '', d)}" +PACKAGECONFIG ?= "egl opengl-es gstreamer1 pulseaudio luajit ${@bb.utils.filter('DISTRO_FEATURES', 'wayland', d)}" PACKAGECONFIG_class-native = "luajit" PACKAGECONFIG[wayland] = "--enable-wayland --enable-wayland-ivi-shell,--disable-wayland --disable-wayland-ivi-shell,wayland" -- cgit 1.2.3-korg