diff options
| author |   Otavio Salvador <otavio@ossystems.com.br> | 2014-04-24 15:59:20 -0300 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-04-25 17:19:19 +0100 |
| commit | 4c14b094985216c433d330fb3d9532d4b6c91fcf (patch) | |
| tree | 6970f383436ca29450779bd98c378aae89f2e079 /meta/recipes-connectivity/openssl | |
| parent | 08a38a7865c41ec60f4b993b964f8d477ea0f680 (diff) | |
| download | openembedded-core-contrib-4c14b094985216c433d330fb3d9532d4b6c91fcf.tar.gz | |
Globally replace 'base_contains' calls with 'bb.utils.contains'
The base_contains is kept as a compatibility method and we ought to
not use it in OE-Core so we can remove it from base metadata in
future.
(From OE-Core rev: d83b16dbf0862be387f84228710cb165c6d2b03b)
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-connectivity/openssl')
| -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 ee02fb796e..229ec870cd 100644 --- a/meta/recipes-connectivity/openssl/openssl.inc +++ b/meta/recipes-connectivity/openssl/openssl.inc @@ -37,7 +37,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 @@ -157,7 +157,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 |