diff options
author | Peter Kjellerstedt <peter.kjellerstedt@axis.com> | 2017-02-27 14:02:50 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-03-01 11:17:45 +0000 |
commit | 254bfb107134702d8d1e0bfbdd1b011212e8c291 (patch) | |
tree | 188ddf3ea786bc1b913904330e4f95125bd6def4 /meta/recipes-connectivity/openssl/openssl.inc | |
parent | dec5650bc292aa3c4a0a04ace72d2cf762e9620b (diff) | |
download | poky-254bfb107134702d8d1e0bfbdd1b011212e8c291.tar.gz |
recipes: Make use of the new bb.utils.filter() function
(From OE-Core rev: 0a1427bf9aeeda6bee2cc0af8da4ea5fd90aef6f)
Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-connectivity/openssl/openssl.inc')
-rw-r--r-- | meta/recipes-connectivity/openssl/openssl.inc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/meta/recipes-connectivity/openssl/openssl.inc b/meta/recipes-connectivity/openssl/openssl.inc index fc55925615..0b7991d1fd 100644 --- a/meta/recipes-connectivity/openssl/openssl.inc +++ b/meta/recipes-connectivity/openssl/openssl.inc | |||
@@ -37,7 +37,7 @@ FILES_libcrypto = "${libdir}/libcrypto${SOLIBS}" | |||
37 | FILES_libssl = "${libdir}/libssl${SOLIBS}" | 37 | FILES_libssl = "${libdir}/libssl${SOLIBS}" |
38 | FILES_${PN} =+ " ${libdir}/ssl/*" | 38 | FILES_${PN} =+ " ${libdir}/ssl/*" |
39 | FILES_${PN}-misc = "${libdir}/ssl/misc" | 39 | FILES_${PN}-misc = "${libdir}/ssl/misc" |
40 | RDEPENDS_${PN}-misc = "${@bb.utils.contains('PACKAGECONFIG', 'perl', 'perl', '', d)}" | 40 | RDEPENDS_${PN}-misc = "${@bb.utils.filter('PACKAGECONFIG', 'perl', d)}" |
41 | 41 | ||
42 | # Add the openssl.cnf file to the openssl-conf package. Make the libcrypto | 42 | # Add the openssl.cnf file to the openssl-conf package. Make the libcrypto |
43 | # package RRECOMMENDS on this package. This will enable the configuration | 43 | # package RRECOMMENDS on this package. This will enable the configuration |
@@ -185,7 +185,7 @@ do_install () { | |||
185 | sed -i -e 's,/etc/openssl,${sysconfdir}/ssl,g' ${D}${bindir}/c_rehash | 185 | sed -i -e 's,/etc/openssl,${sysconfdir}/ssl,g' ${D}${bindir}/c_rehash |
186 | 186 | ||
187 | oe_multilib_header openssl/opensslconf.h | 187 | oe_multilib_header openssl/opensslconf.h |
188 | if [ "${@bb.utils.contains('PACKAGECONFIG', 'perl', 'perl', '', d)}" = "perl" ]; then | 188 | if [ "${@bb.utils.filter('PACKAGECONFIG', 'perl', d)}" ]; then |
189 | sed -i -e '1s,.*,#!${bindir}/env perl,' ${D}${libdir}/ssl/misc/CA.pl | 189 | sed -i -e '1s,.*,#!${bindir}/env perl,' ${D}${libdir}/ssl/misc/CA.pl |
190 | sed -i -e '1s,.*,#!${bindir}/env perl,' ${D}${libdir}/ssl/misc/tsget | 190 | sed -i -e '1s,.*,#!${bindir}/env perl,' ${D}${libdir}/ssl/misc/tsget |
191 | else | 191 | else |