diff options
author | Ross Burton <ross.burton@intel.com> | 2016-04-22 20:48:49 +0100 |
---|---|---|
committer | Armin Kuster <akuster808@gmail.com> | 2016-05-02 14:03:03 -0700 |
commit | cf1819332d48d3307aa2e80255834aa7911cd0dc (patch) | |
tree | f09b113c456f713beab1df0d084122eaca59570d /meta-oe/recipes-support/lvm2 | |
parent | 0e6cc19225103311e5c696618aec3fdaf8a10274 (diff) | |
download | meta-openembedded-cf1819332d48d3307aa2e80255834aa7911cd0dc.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>
Signed-off-by: Armin Kuster <akuster808@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 a8d44daea..3a5e1c46a 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}" | |||
17 | 17 | ||
18 | inherit autotools-brokensep pkgconfig systemd | 18 | inherit autotools-brokensep pkgconfig systemd |
19 | 19 | ||
20 | PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'selinux', 'selinux', '', d)}" | 20 | PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'selinux', 'selinux', '', d)}" |
21 | 21 | ||
22 | PACKAGECONFIG[readline] = "--enable-readline,--disable-readline,readline" | 22 | PACKAGECONFIG[readline] = "--enable-readline,--disable-readline,readline" |
23 | PACKAGECONFIG[selinux] = "--enable-selinux,--disable-selinux,libselinux" | 23 | PACKAGECONFIG[selinux] = "--enable-selinux,--disable-selinux,libselinux" |
@@ -43,7 +43,7 @@ do_install_append() { | |||
43 | # Install machine specific configuration file | 43 | # Install machine specific configuration file |
44 | install -m 0644 ${WORKDIR}/lvm.conf ${D}${sysconfdir}/lvm/lvm.conf | 44 | install -m 0644 ${WORKDIR}/lvm.conf ${D}${sysconfdir}/lvm/lvm.conf |
45 | sed -i -e 's:@libdir@:${libdir}:g' ${D}${sysconfdir}/lvm/lvm.conf | 45 | sed -i -e 's:@libdir@:${libdir}:g' ${D}${sysconfdir}/lvm/lvm.conf |
46 | if ${@base_contains('DISTRO_FEATURES','systemd','true','false',d)}; then | 46 | if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then |
47 | oe_runmake 'DESTDIR=${D}' install install_systemd_units | 47 | oe_runmake 'DESTDIR=${D}' install install_systemd_units |
48 | sed -i -e 's:/usr/bin/true:${base_bindir}/true:g' ${D}${systemd_system_unitdir}/blk-availability.service | 48 | sed -i -e 's:/usr/bin/true:${base_bindir}/true:g' ${D}${systemd_system_unitdir}/blk-availability.service |
49 | else | 49 | else |