diff options
| author |   Ross Burton <ross.burton@intel.com> | 2016-04-22 20:48:49 +0100 |
|---|---|---|
| committer |   Martin Jansa <Martin.Jansa@gmail.com> | 2016-04-28 10:38:38 +0200 |
| commit | 21f10c11f39020f9502d741c774a12d1aeb39499 (patch) | |
| tree | fdc66c039950da89d82b6b7405ebfc50cbba693a /meta-oe/recipes-support/lvm2 | |
| parent | 723b55f5c1f7df21dbcfa7cb2dcaecb10d886041 (diff) | |
| download | meta-openembedded-contrib-21f10c11f39020f9502d741c774a12d1aeb39499.tar.gz | |
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 <ross.burton@intel.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'meta-oe/recipes-support/lvm2')
| -rw-r--r-- | meta-oe/recipes-support/lvm2/lvm2.inc | 4 |
1 files changed, 2 insertions, 2 deletions
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 |