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>
This commit is contained in:
parent
e38ec0caa7
commit
66ecbd3405
|
@ -34,11 +34,10 @@ inherit pkgconfig siteinfo multilib_header ptest
|
|||
|
||||
PACKAGES =+ "libcrypto libssl ${PN}-misc openssl-conf"
|
||||
FILES_libcrypto = "${libdir}/libcrypto${SOLIBS}"
|
||||
FILES_libssl = "${libdir}/libssl.so.*"
|
||||
FILES_libssl = "${libdir}/libssl${SOLIBS}"
|
||||
FILES_${PN} =+ " ${libdir}/ssl/*"
|
||||
FILES_${PN}-misc = "${libdir}/ssl/misc ${bindir}/c_rehash"
|
||||
RDEPENDS_${PN}-misc = "${@bb.utils.contains('PACKAGECONFIG', 'perl', 'perl', '', d)}"
|
||||
FILES_${PN}-dev += "${libdir}/libcrypto${SOLIBSDEV}"
|
||||
|
||||
# Add the openssl.cnf file to the openssl-conf package. Make the libcrypto
|
||||
# package RRECOMMENDS on this package. This will enable the configuration
|
||||
|
|
Loading…
Reference in New Issue