diff options
| author |   Ross Burton <ross.burton@intel.com> | 2016-04-22 20:48:52 +0100 |
|---|---|---|
| committer |   Martin Jansa <Martin.Jansa@gmail.com> | 2016-04-28 10:38:38 +0200 |
| commit | f08b75f64ccf52c416a2ebaeb2e27d1e50877583 (patch) | |
| tree | 714583f0f25a207e60f003d73419473ef66831f9 | |
| parent | e5c807b77fbe753e28483ae7d58d8a5dec676ace (diff) | |
| download | meta-openembedded-contrib-f08b75f64ccf52c416a2ebaeb2e27d1e50877583.tar.gz | |
meta-xfce: 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>
| -rw-r--r-- | meta-xfce/recipes-xfce/xfce4-power-manager/xfce4-power-manager_1.4.4.bb | 4 | ||||
| -rw-r--r-- | meta-xfce/recipes-xfce/xfce4-settings/xfce4-settings_git.bb | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/meta-xfce/recipes-xfce/xfce4-power-manager/xfce4-power-manager_1.4.4.bb b/meta-xfce/recipes-xfce/xfce4-power-manager/xfce4-power-manager_1.4.4.bb index fa38c8af09..81b6771f5a 100644 --- a/meta-xfce/recipes-xfce/xfce4-power-manager/xfce4-power-manager_1.4.4.bb +++ b/meta-xfce/recipes-xfce/xfce4-power-manager/xfce4-power-manager_1.4.4.bb @@ -18,7 +18,7 @@ EXTRA_OECONF = " \ --enable-panel-plugins \ " -PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES','systemd','systemd','',d)}" +PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES','systemd','systemd','',d)}" PACKAGECONFIG[systemd] = "--enable-polkit, --disable-polkit, polkit" PACKAGES += "xfce4-powermanager-plugin" @@ -34,7 +34,7 @@ FILES_xfce4-powermanager-plugin = " \ " RDEPENDS_xfce4-powermanager-plugin = "${PN}" -RDEPENDS_${PN} = "networkmanager ${@base_contains('DISTRO_FEATURES','systemd','','consolekit',d)}" +RDEPENDS_${PN} = "networkmanager ${@bb.utils.contains('DISTRO_FEATURES','systemd','','consolekit',d)}" # xfce4-brightness-plugin was replaced by xfce4-powermanager-plugin RPROVIDES_xfce4-powermanager-plugin += "xfce4-brightness-plugin" diff --git a/meta-xfce/recipes-xfce/xfce4-settings/xfce4-settings_git.bb b/meta-xfce/recipes-xfce/xfce4-settings/xfce4-settings_git.bb index c8224a16e7..d5ed04468c 100644 --- a/meta-xfce/recipes-xfce/xfce4-settings/xfce4-settings_git.bb +++ b/meta-xfce/recipes-xfce/xfce4-settings/xfce4-settings_git.bb @@ -21,8 +21,8 @@ PV = "4.12.0+git${SRCPV}" EXTRA_OECONF += "--enable-maintainer-mode --disable-debug" PACKAGECONFIG ??= " \ - ${@base_contains('DISTRO_FEATURES','systemd','datetime-setter','',d)} \ - ${@base_contains('DISTRO_FEATURES','alsa','sound-setter', base_contains('DISTRO_FEATURES','pulseaudio','sound-setter','',d),d)} \ + ${@bb.utils.contains('DISTRO_FEATURES','systemd','datetime-setter','',d)} \ + ${@bb.utils.contains('DISTRO_FEATURES','alsa','sound-setter', bb.utils.contains('DISTRO_FEATURES','pulseaudio','sound-setter','',d),d)} \ " PACKAGECONFIG[datetime-setter] = "--enable-datetime-settings, --disable-datetime-settings,, tzdata" PACKAGECONFIG[notify] = "--enable-libnotify,--disable-libnotify,libnotify" @@ -34,5 +34,5 @@ FILES_${PN} += " \ " RRECOMMENDS_${PN} += "adwaita-icon-theme" -RRECOMMENDS_${PN} += "${@base_contains('DISTRO_FEATURES','alsa','libcanberra-alsa','',d)}" -RRECOMMENDS_${PN} += "${@base_contains('DISTRO_FEATURES','pulseaudio','libcanberra-pulse','',d)}" +RRECOMMENDS_${PN} += "${@bb.utils.contains('DISTRO_FEATURES','alsa','libcanberra-alsa','',d)}" +RRECOMMENDS_${PN} += "${@bb.utils.contains('DISTRO_FEATURES','pulseaudio','libcanberra-pulse','',d)}" |