From 21f10c11f39020f9502d741c774a12d1aeb39499 Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Fri, 22 Apr 2016 20:48:49 +0100 Subject: meta-oe: 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 Signed-off-by: Martin Jansa --- meta-oe/recipes-support/lvm2/lvm2.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'meta-oe/recipes-support/lvm2') diff --git a/meta-oe/recipes-support/lvm2/lvm2.inc b/meta-oe/recipes-support/lvm2/lvm2.inc index a8d44daea3..3a5e1c46aa 100644 --- a/meta-oe/recipes-support/lvm2/lvm2.inc +++ b/meta-oe/recipes-support/lvm2/lvm2.inc @@ -17,7 +17,7 @@ S = "${WORKDIR}/LVM2.${PV}" inherit autotools-brokensep pkgconfig systemd -PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'selinux', 'selinux', '', d)}" +PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'selinux', 'selinux', '', d)}" PACKAGECONFIG[readline] = "--enable-readline,--disable-readline,readline" PACKAGECONFIG[selinux] = "--enable-selinux,--disable-selinux,libselinux" @@ -43,7 +43,7 @@ do_install_append() { # Install machine specific configuration file install -m 0644 ${WORKDIR}/lvm.conf ${D}${sysconfdir}/lvm/lvm.conf sed -i -e 's:@libdir@:${libdir}:g' ${D}${sysconfdir}/lvm/lvm.conf - if ${@base_contains('DISTRO_FEATURES','systemd','true','false',d)}; then + if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then oe_runmake 'DESTDIR=${D}' install install_systemd_units sed -i -e 's:/usr/bin/true:${base_bindir}/true:g' ${D}${systemd_system_unitdir}/blk-availability.service else -- cgit v1.2.3-54-g00ecf