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-benchmark/libhugetlbfs/libhugetlbfs_git.bb | 2 +- meta-oe/recipes-benchmark/lmbench/lmbench_3.0-a9.bb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'meta-oe/recipes-benchmark') diff --git a/meta-oe/recipes-benchmark/libhugetlbfs/libhugetlbfs_git.bb b/meta-oe/recipes-benchmark/libhugetlbfs/libhugetlbfs_git.bb index b7cc4162aa..015d4463a5 100644 --- a/meta-oe/recipes-benchmark/libhugetlbfs/libhugetlbfs_git.bb +++ b/meta-oe/recipes-benchmark/libhugetlbfs/libhugetlbfs_git.bb @@ -37,7 +37,7 @@ TARGET_CC_ARCH += "${LDFLAGS}" #The CUSTOM_LDSCRIPTS doesn't work with the gold linker do_configure() { - if [ "${@base_contains('DISTRO_FEATURES', 'ld-is-gold', 'ld-is-gold', '', d)}" = "ld-is-gold" ] ; then + if [ "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', 'ld-is-gold', '', d)}" = "ld-is-gold" ] ; then sed -i 's/CUSTOM_LDSCRIPTS = yes/CUSTOM_LDSCRIPTS = no/' Makefile fi diff --git a/meta-oe/recipes-benchmark/lmbench/lmbench_3.0-a9.bb b/meta-oe/recipes-benchmark/lmbench/lmbench_3.0-a9.bb index 24cd0b0eaf..5459bf9cb8 100644 --- a/meta-oe/recipes-benchmark/lmbench/lmbench_3.0-a9.bb +++ b/meta-oe/recipes-benchmark/lmbench/lmbench_3.0-a9.bb @@ -46,7 +46,7 @@ do_install () { echo "d root root 0755 ${localstatedir}/run/${BPN} none" \ > ${D}${sysconfdir}/default/volatiles/99_lmbench - 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}/tmpfiles.d echo "d /run/${BPN} - - - -" \ > ${D}${sysconfdir}/tmpfiles.d/lmbench.conf -- cgit v1.2.3-54-g00ecf