diff options
author | Andre McCurdy <armccurdy@gmail.com> | 2016-04-06 17:42:05 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-04-09 23:00:45 +0100 |
commit | 66ecbd3405b94ff051f9a69936f4387e9a973a86 (patch) | |
tree | e9f44a5801720fc99c414ecb5621008c709cee6e /meta/recipes-connectivity/openssl/openssl.inc | |
parent | e38ec0caa75186da82e2d9a296069a1cefcf72bd (diff) | |
download | poky-66ecbd3405b94ff051f9a69936f4387e9a973a86.tar.gz |
openssl.inc: minor packaging cleanup
libcrypto.so was explicitly added to FILES_${PN}-dev as part of moving
libcrypto from libdir -> base_libdir to support dhclient [1].
However, the line has been unnecessary since ${base_libdir}/lib*.so
files started to be included in FILES_${PN}-dev by default [2] (and
it's still unnecessary now, after moving libcrypto from back to libdir
to support ntp [3]).
[1] http://git.openembedded.org/openembedded-core/commit/?id=01ea85f7f6c53c66c76d6f832518b28bf06ec072
[2] http://git.openembedded.org/openembedded-core/commit/?id=66c36bcb7d9368718453265e58bd5e3c854c786a
[3] http://git.openembedded.org/openembedded-core/commit/?id=0be2ab32f690a2fcba0e821abe11460958bbc6dc
Also define FILES_libssl using SOLIBS instead of a hardcoded pattern.
(From OE-Core rev: 3f81b516e2f23683ce6129bb79bcc08263cb7fe1)
Signed-off-by: Andre McCurdy <armccurdy@gmail.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 | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/meta/recipes-connectivity/openssl/openssl.inc b/meta/recipes-connectivity/openssl/openssl.inc index 0c7e192920..a5ddf4d4b0 100644 --- a/meta/recipes-connectivity/openssl/openssl.inc +++ b/meta/recipes-connectivity/openssl/openssl.inc | |||
@@ -34,11 +34,10 @@ inherit pkgconfig siteinfo multilib_header ptest | |||
34 | 34 | ||
35 | PACKAGES =+ "libcrypto libssl ${PN}-misc openssl-conf" | 35 | PACKAGES =+ "libcrypto libssl ${PN}-misc openssl-conf" |
36 | FILES_libcrypto = "${libdir}/libcrypto${SOLIBS}" | 36 | FILES_libcrypto = "${libdir}/libcrypto${SOLIBS}" |
37 | FILES_libssl = "${libdir}/libssl.so.*" | 37 | FILES_libssl = "${libdir}/libssl${SOLIBS}" |
38 | FILES_${PN} =+ " ${libdir}/ssl/*" | 38 | FILES_${PN} =+ " ${libdir}/ssl/*" |
39 | FILES_${PN}-misc = "${libdir}/ssl/misc ${bindir}/c_rehash" | 39 | FILES_${PN}-misc = "${libdir}/ssl/misc ${bindir}/c_rehash" |
40 | RDEPENDS_${PN}-misc = "${@bb.utils.contains('PACKAGECONFIG', 'perl', 'perl', '', d)}" | 40 | RDEPENDS_${PN}-misc = "${@bb.utils.contains('PACKAGECONFIG', 'perl', 'perl', '', d)}" |
41 | FILES_${PN}-dev += "${libdir}/libcrypto${SOLIBSDEV}" | ||
42 | 41 | ||
43 | # 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 |
44 | # package RRECOMMENDS on this package. This will enable the configuration | 43 | # package RRECOMMENDS on this package. This will enable the configuration |