summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--recipes-connectivity/openssl/openssl-qoriq.inc4
-rw-r--r--recipes-kernel/cryptodev/cryptodev-qoriq_1.7.inc2
2 files changed, 3 insertions, 3 deletions
diff --git a/recipes-connectivity/openssl/openssl-qoriq.inc b/recipes-connectivity/openssl/openssl-qoriq.inc
index 894c1f0c..faccb080 100644
--- a/recipes-connectivity/openssl/openssl-qoriq.inc
+++ b/recipes-connectivity/openssl/openssl-qoriq.inc
@@ -49,7 +49,7 @@ FILES_libcrypto = "${base_libdir}/libcrypto${SOLIBS}"
49FILES_libssl = "${libdir}/libssl.so.*" 49FILES_libssl = "${libdir}/libssl.so.*"
50FILES_${PN} =+ " ${libdir}/ssl/*" 50FILES_${PN} =+ " ${libdir}/ssl/*"
51FILES_${PN}-misc = "${libdir}/ssl/misc ${bindir}/c_rehash" 51FILES_${PN}-misc = "${libdir}/ssl/misc ${bindir}/c_rehash"
52RDEPENDS_${PN}-misc = "${@base_contains('PACKAGECONFIG', 'perl', 'perl', '', d)}" 52RDEPENDS_${PN}-misc = "${@bb.utils.contains('PACKAGECONFIG', 'perl', 'perl', '', d)}"
53FILES_${PN}-dev += "${base_libdir}/libcrypto${SOLIBSDEV}" 53FILES_${PN}-dev += "${base_libdir}/libcrypto${SOLIBSDEV}"
54 54
55# Add the openssl.cnf file to the openssl-conf package. Make the libcrypto 55# Add the openssl.cnf file to the openssl-conf package. Make the libcrypto
@@ -169,7 +169,7 @@ do_install () {
169 cp --dereference -R include/openssl ${D}${includedir} 169 cp --dereference -R include/openssl ${D}${includedir}
170 170
171 oe_multilib_header openssl/opensslconf.h 171 oe_multilib_header openssl/opensslconf.h
172 if [ "${@base_contains('PACKAGECONFIG', 'perl', 'perl', '', d)}" = "perl" ]; then 172 if [ "${@bb.utils.contains('PACKAGECONFIG', 'perl', 'perl', '', d)}" = "perl" ]; then
173 install -m 0755 ${S}/tools/c_rehash ${D}${bindir} 173 install -m 0755 ${S}/tools/c_rehash ${D}${bindir}
174 sed -i -e '1s,.*,#!${bindir}/env perl,' ${D}${bindir}/c_rehash 174 sed -i -e '1s,.*,#!${bindir}/env perl,' ${D}${bindir}/c_rehash
175 sed -i -e '1s,.*,#!${bindir}/env perl,' ${D}${libdir}/ssl/misc/CA.pl 175 sed -i -e '1s,.*,#!${bindir}/env perl,' ${D}${libdir}/ssl/misc/CA.pl
diff --git a/recipes-kernel/cryptodev/cryptodev-qoriq_1.7.inc b/recipes-kernel/cryptodev/cryptodev-qoriq_1.7.inc
index aa0e9948..e4700db4 100644
--- a/recipes-kernel/cryptodev/cryptodev-qoriq_1.7.inc
+++ b/recipes-kernel/cryptodev/cryptodev-qoriq_1.7.inc
@@ -55,7 +55,7 @@ file://0024-fix-COMPAT_CIOCKEY-ioctl-command-number.patch \
55 55
56# NOTE: remove this patch and all traces of DISTRO_FEATURE c29x_pkc 56# NOTE: remove this patch and all traces of DISTRO_FEATURE c29x_pkc
57# if pkc-host does not need customized cryptodev patches anymore 57# if pkc-host does not need customized cryptodev patches anymore
58SRC_URI_append = "${@base_contains('DISTRO_FEATURES', 'c29x_pkc', ' file://0001-don-t-advertise-RSA-keygen.patch', '', d)}" 58SRC_URI_append = "${@bb.utils.contains('DISTRO_FEATURES', 'c29x_pkc', ' file://0001-don-t-advertise-RSA-keygen.patch', '', d)}"
59 59
60S = "${WORKDIR}/cryptodev-linux-${PV}" 60S = "${WORKDIR}/cryptodev-linux-${PV}"
61 61