From 4c14b094985216c433d330fb3d9532d4b6c91fcf Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Thu, 24 Apr 2014 15:59:20 -0300 Subject: Globally replace 'base_contains' calls with 'bb.utils.contains' The base_contains is kept as a compatibility method and we ought to not use it in OE-Core so we can remove it from base metadata in future. (From OE-Core rev: d83b16dbf0862be387f84228710cb165c6d2b03b) Signed-off-by: Otavio Salvador Signed-off-by: Richard Purdie --- meta/recipes-graphics/x11-common/xserver-nodm-init.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'meta/recipes-graphics/x11-common') diff --git a/meta/recipes-graphics/x11-common/xserver-nodm-init.bb b/meta/recipes-graphics/x11-common/xserver-nodm-init.bb index e4508a917d..0a16ff5f83 100644 --- a/meta/recipes-graphics/x11-common/xserver-nodm-init.bb +++ b/meta/recipes-graphics/x11-common/xserver-nodm-init.bb @@ -22,7 +22,7 @@ do_install() { install -d ${D}${sysconfdir}/init.d install xserver-nodm ${D}${sysconfdir}/init.d - if ${@base_contains('DISTRO_FEATURES','systemd','true','false',d)}; then + if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then install -d ${D}${sysconfdir}/default install xserver-nodm.conf ${D}${sysconfdir}/default/xserver-nodm install -d ${D}${systemd_unitdir}/system @@ -36,7 +36,7 @@ do_install() { fi fi - if ${@base_contains('DISTRO_FEATURES','sysvinit','true','false',d)}; then + if ${@bb.utils.contains('DISTRO_FEATURES','sysvinit','true','false',d)}; then if [ "${ROOTLESS_X}" = "1" ] ; then install -d ${D}${sysconfdir}/X11 install Xusername ${D}${sysconfdir}/X11 -- cgit v1.2.3-54-g00ecf