From f0d1257ab87d71f0afb7b8cc5fdfbd97f546327a Mon Sep 17 00:00:00 2001 From: Zhenhua Luo Date: Mon, 9 May 2016 04:26:13 -0500 Subject: openssl/cryptodev: base_contains -> bb.utils.contains base_contains is deprecated. Signed-off-by: Zhenhua Luo --- recipes-connectivity/openssl/openssl.inc | 4 ++-- recipes-kernel/cryptodev/cryptodev_1.7.inc | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/recipes-connectivity/openssl/openssl.inc b/recipes-connectivity/openssl/openssl.inc index bf159de..aa1143d 100644 --- a/recipes-connectivity/openssl/openssl.inc +++ b/recipes-connectivity/openssl/openssl.inc @@ -38,7 +38,7 @@ FILES_libcrypto = "${base_libdir}/libcrypto${SOLIBS}" FILES_libssl = "${libdir}/libssl.so.*" FILES_${PN} =+ " ${libdir}/ssl/*" FILES_${PN}-misc = "${libdir}/ssl/misc ${bindir}/c_rehash" -RDEPENDS_${PN}-misc = "${@base_contains('PACKAGECONFIG', 'perl', 'perl', '', d)}" +RDEPENDS_${PN}-misc = "${@bb.utils.contains('PACKAGECONFIG', 'perl', 'perl', '', d)}" FILES_${PN}-dev += "${base_libdir}/libcrypto${SOLIBSDEV}" # Add the openssl.cnf file to the openssl-conf package. Make the libcrypto @@ -158,7 +158,7 @@ do_install () { cp --dereference -R include/openssl ${D}${includedir} oe_multilib_header openssl/opensslconf.h - if [ "${@base_contains('PACKAGECONFIG', 'perl', 'perl', '', d)}" = "perl" ]; then + if [ "${@bb.utils.contains('PACKAGECONFIG', 'perl', 'perl', '', d)}" = "perl" ]; then install -m 0755 ${S}/tools/c_rehash ${D}${bindir} sed -i -e '1s,.*,#!${bindir}/env perl,' ${D}${bindir}/c_rehash sed -i -e '1s,.*,#!${bindir}/env perl,' ${D}${libdir}/ssl/misc/CA.pl diff --git a/recipes-kernel/cryptodev/cryptodev_1.7.inc b/recipes-kernel/cryptodev/cryptodev_1.7.inc index 27e679d..2060ce3 100644 --- a/recipes-kernel/cryptodev/cryptodev_1.7.inc +++ b/recipes-kernel/cryptodev/cryptodev_1.7.inc @@ -46,7 +46,7 @@ file://0024-fix-COMPAT_CIOCKEY-ioctl-command-number.patch \ # NOTE: remove this patch and all traces of DISTRO_FEATURE c29x_pkc # if pkc-host does not need customized cryptodev patches anymore -SRC_URI_append = "${@base_contains('DISTRO_FEATURES', 'c29x_pkc', ' file://0001-don-t-advertise-RSA-keygen.patch', '', d)}" +SRC_URI_append = "${@bb.utils.contains('DISTRO_FEATURES', 'c29x_pkc', ' file://0001-don-t-advertise-RSA-keygen.patch', '' ,d)}" S = "${WORKDIR}/cryptodev-linux-${PV}" -- cgit v1.2.3-54-g00ecf