diff options
author | Zhenhua Luo <zhenhua.luo@nxp.com> | 2016-05-09 04:26:13 -0500 |
---|---|---|
committer | Zhenhua Luo <zhenhua.luo@nxp.com> | 2016-05-10 11:20:54 +0800 |
commit | f0d1257ab87d71f0afb7b8cc5fdfbd97f546327a (patch) | |
tree | 3bbdfbb6e78f3ecb8c01b5b2a7a7e4376bd3a080 | |
parent | 19f9b87894f188c8b8fb58df5e310f15a07df973 (diff) | |
download | meta-fsl-ppc-f0d1257ab87d71f0afb7b8cc5fdfbd97f546327a.tar.gz |
openssl/cryptodev: base_contains -> bb.utils.contains
base_contains is deprecated.
Signed-off-by: Zhenhua Luo <zhenhua.luo@nxp.com>
-rw-r--r-- | recipes-connectivity/openssl/openssl.inc | 4 | ||||
-rw-r--r-- | 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}" | |||
38 | FILES_libssl = "${libdir}/libssl.so.*" | 38 | FILES_libssl = "${libdir}/libssl.so.*" |
39 | FILES_${PN} =+ " ${libdir}/ssl/*" | 39 | FILES_${PN} =+ " ${libdir}/ssl/*" |
40 | FILES_${PN}-misc = "${libdir}/ssl/misc ${bindir}/c_rehash" | 40 | FILES_${PN}-misc = "${libdir}/ssl/misc ${bindir}/c_rehash" |
41 | RDEPENDS_${PN}-misc = "${@base_contains('PACKAGECONFIG', 'perl', 'perl', '', d)}" | 41 | RDEPENDS_${PN}-misc = "${@bb.utils.contains('PACKAGECONFIG', 'perl', 'perl', '', d)}" |
42 | FILES_${PN}-dev += "${base_libdir}/libcrypto${SOLIBSDEV}" | 42 | FILES_${PN}-dev += "${base_libdir}/libcrypto${SOLIBSDEV}" |
43 | 43 | ||
44 | # Add the openssl.cnf file to the openssl-conf package. Make the libcrypto | 44 | # Add the openssl.cnf file to the openssl-conf package. Make the libcrypto |
@@ -158,7 +158,7 @@ do_install () { | |||
158 | cp --dereference -R include/openssl ${D}${includedir} | 158 | cp --dereference -R include/openssl ${D}${includedir} |
159 | 159 | ||
160 | oe_multilib_header openssl/opensslconf.h | 160 | oe_multilib_header openssl/opensslconf.h |
161 | if [ "${@base_contains('PACKAGECONFIG', 'perl', 'perl', '', d)}" = "perl" ]; then | 161 | if [ "${@bb.utils.contains('PACKAGECONFIG', 'perl', 'perl', '', d)}" = "perl" ]; then |
162 | install -m 0755 ${S}/tools/c_rehash ${D}${bindir} | 162 | install -m 0755 ${S}/tools/c_rehash ${D}${bindir} |
163 | sed -i -e '1s,.*,#!${bindir}/env perl,' ${D}${bindir}/c_rehash | 163 | sed -i -e '1s,.*,#!${bindir}/env perl,' ${D}${bindir}/c_rehash |
164 | sed -i -e '1s,.*,#!${bindir}/env perl,' ${D}${libdir}/ssl/misc/CA.pl | 164 | 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 \ | |||
46 | 46 | ||
47 | # NOTE: remove this patch and all traces of DISTRO_FEATURE c29x_pkc | 47 | # NOTE: remove this patch and all traces of DISTRO_FEATURE c29x_pkc |
48 | # if pkc-host does not need customized cryptodev patches anymore | 48 | # if pkc-host does not need customized cryptodev patches anymore |
49 | SRC_URI_append = "${@base_contains('DISTRO_FEATURES', 'c29x_pkc', ' file://0001-don-t-advertise-RSA-keygen.patch', '', d)}" | 49 | SRC_URI_append = "${@bb.utils.contains('DISTRO_FEATURES', 'c29x_pkc', ' file://0001-don-t-advertise-RSA-keygen.patch', '' ,d)}" |
50 | 50 | ||
51 | S = "${WORKDIR}/cryptodev-linux-${PV}" | 51 | S = "${WORKDIR}/cryptodev-linux-${PV}" |
52 | 52 | ||