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-benchmark | |
parent | 723b55f5c1f7df21dbcfa7cb2dcaecb10d886041 (diff) | |
download | meta-openembedded-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-benchmark')
-rw-r--r-- | meta-oe/recipes-benchmark/libhugetlbfs/libhugetlbfs_git.bb | 2 | ||||
-rw-r--r-- | meta-oe/recipes-benchmark/lmbench/lmbench_3.0-a9.bb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/meta-oe/recipes-benchmark/libhugetlbfs/libhugetlbfs_git.bb b/meta-oe/recipes-benchmark/libhugetlbfs/libhugetlbfs_git.bb index b7cc4162a..015d4463a 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}" | |||
37 | 37 | ||
38 | #The CUSTOM_LDSCRIPTS doesn't work with the gold linker | 38 | #The CUSTOM_LDSCRIPTS doesn't work with the gold linker |
39 | do_configure() { | 39 | do_configure() { |
40 | if [ "${@base_contains('DISTRO_FEATURES', 'ld-is-gold', 'ld-is-gold', '', d)}" = "ld-is-gold" ] ; then | 40 | if [ "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', 'ld-is-gold', '', d)}" = "ld-is-gold" ] ; then |
41 | sed -i 's/CUSTOM_LDSCRIPTS = yes/CUSTOM_LDSCRIPTS = no/' Makefile | 41 | sed -i 's/CUSTOM_LDSCRIPTS = yes/CUSTOM_LDSCRIPTS = no/' Makefile |
42 | fi | 42 | fi |
43 | 43 | ||
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 24cd0b0ea..5459bf9cb 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 () { | |||
46 | 46 | ||
47 | echo "d root root 0755 ${localstatedir}/run/${BPN} none" \ | 47 | echo "d root root 0755 ${localstatedir}/run/${BPN} none" \ |
48 | > ${D}${sysconfdir}/default/volatiles/99_lmbench | 48 | > ${D}${sysconfdir}/default/volatiles/99_lmbench |
49 | if ${@base_contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then | 49 | if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then |
50 | install -d ${D}${sysconfdir}/tmpfiles.d | 50 | install -d ${D}${sysconfdir}/tmpfiles.d |
51 | echo "d /run/${BPN} - - - -" \ | 51 | echo "d /run/${BPN} - - - -" \ |
52 | > ${D}${sysconfdir}/tmpfiles.d/lmbench.conf | 52 | > ${D}${sysconfdir}/tmpfiles.d/lmbench.conf |