From b729cae26de23ac6df10cbf74bab0105580cc43d Mon Sep 17 00:00:00 2001 From: Andrej Valek Date: Tue, 17 Jul 2018 11:10:34 +0200 Subject: openssl-1.1: rework packaging The main idea is to have libssl and libcrypto in separate packages. This saves space if only single library is needed and also some recipes (in other layers) depend on these library packages. Together with this other packages like in 1.0.x were created. The only difference is that openssl 1.1 has additional package openssl-bin. Add missing dependency to perl for openssl-bin pkg, c_rehash requires it. Signed-off-by: Andrej Valek Signed-off-by: Marko Peter Signed-off-by: Richard Purdie --- meta/recipes-connectivity/openssl/openssl_1.1.0h.bb | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) (limited to 'meta/recipes-connectivity') diff --git a/meta/recipes-connectivity/openssl/openssl_1.1.0h.bb b/meta/recipes-connectivity/openssl/openssl_1.1.0h.bb index 1a4e4348c2..4f80a807cd 100644 --- a/meta/recipes-connectivity/openssl/openssl_1.1.0h.bb +++ b/meta/recipes-connectivity/openssl/openssl_1.1.0h.bb @@ -160,12 +160,22 @@ do_install_ptest() { sed -i 's/$target{shared_extension_simple}/".so.ptest"/' ${D}${PTEST_PATH}/test/recipes/90-test_shlibload.t } -PACKAGES =+ "${PN}-engines" +PACKAGES =+ "libcrypto libssl ${PN}-misc ${PN}-engines openssl-conf" +FILES_libcrypto = "${libdir}/libcrypto${SOLIBS}" +FILES_libssl = "${libdir}/libssl${SOLIBS}" FILES_${PN} =+ "${libdir}/ssl-1.1/*" FILES_${PN}_append_class-nativesdk = " ${SDKPATHNATIVE}/environment-setup.d/openssl.sh" FILES_${PN}-engines = "${libdir}/engines-1.1" +FILES_${PN}-misc = "${libdir}/ssl-1.1/misc" +RDEPENDS_${PN}-misc = "${@bb.utils.filter('PACKAGECONFIG', 'perl', d)}" + +FILES_openssl-conf = "${libdir}/ssl-1.1/openssl.cnf" +CONFFILES_openssl-conf = "${libdir}/ssl-1.1/openssl.cnf" +RRECOMMENDS_libcrypto += "openssl-conf" + +RDEPENDS_${PN}-bin = "perl" RDEPENDS_${PN}-ptest += "perl-module-file-spec-functions bash python" BBCLASSEXTEND = "native nativesdk" -- cgit 1.2.3-korg