summaryrefslogtreecommitdiffstats
path: root/meta-efl
diff options
context:
space:
mode:
authorPeter Kjellerstedt <peter.kjellerstedt@axis.com>2017-03-01 18:30:49 +0100
committerMartin Jansa <Martin.Jansa@gmail.com>2017-03-07 13:30:26 +0100
commit0c31f55bcfd6630d894dd2dda6ca483bea5de4ab (patch)
tree362ae6300bfa295709e24a4879639fb4c0fb5116 /meta-efl
parentb4524eb786472e69e28212a58a329a5e44e40547 (diff)
downloadmeta-openembedded-0c31f55bcfd6630d894dd2dda6ca483bea5de4ab.tar.gz
Make use of the new bb.utils.filter() function
Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'meta-efl')
-rw-r--r--meta-efl/recipes-efl/e17/e-wm.inc4
-rw-r--r--meta-efl/recipes-efl/efl/efl.inc2
2 files changed, 2 insertions, 4 deletions
diff --git a/meta-efl/recipes-efl/e17/e-wm.inc b/meta-efl/recipes-efl/e17/e-wm.inc
index 444ec8959..a6e964b55 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"
7inherit e update-alternatives gettext pkgconfig 7inherit e update-alternatives gettext pkgconfig
8S = "${WORKDIR}/${SRCNAME}" 8S = "${WORKDIR}/${SRCNAME}"
9 9
10PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'pam', '', d)} \ 10PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'pam systemd', d)}"
11 ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)}"
12PACKAGECONFIG[pam] = "--enable-pam,--disable-pam,libpam" 11PACKAGECONFIG[pam] = "--enable-pam,--disable-pam,libpam"
13PACKAGECONFIG[systemd] = "--enable-systemd,--disable-systemd,systemd" 12PACKAGECONFIG[systemd] = "--enable-systemd,--disable-systemd,systemd"
14 13
15
16EXTRA_OECONF = "\ 14EXTRA_OECONF = "\
17 --with-edje-cc=${STAGING_BINDIR_NATIVE}/edje_cc \ 15 --with-edje-cc=${STAGING_BINDIR_NATIVE}/edje_cc \
18 --with-eet-eet=${STAGING_BINDIR_NATIVE}/eet \ 16 --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 5436b40dd..59ae8d75a 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 = " \
51 --disable-image-loader-dds \ 51 --disable-image-loader-dds \
52" 52"
53 53
54PACKAGECONFIG ?= "egl opengl-es gstreamer1 pulseaudio luajit ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'wayland', '', d)}" 54PACKAGECONFIG ?= "egl opengl-es gstreamer1 pulseaudio luajit ${@bb.utils.filter('DISTRO_FEATURES', 'wayland', d)}"
55PACKAGECONFIG_class-native = "luajit" 55PACKAGECONFIG_class-native = "luajit"
56 56
57PACKAGECONFIG[wayland] = "--enable-wayland --enable-wayland-ivi-shell,--disable-wayland --disable-wayland-ivi-shell,wayland" 57PACKAGECONFIG[wayland] = "--enable-wayland --enable-wayland-ivi-shell,--disable-wayland --disable-wayland-ivi-shell,wayland"