summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrej Valek <andrej.valek@siemens.com>2018-07-17 11:10:34 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-08-16 09:49:38 +0100
commit97901ab12071017b7d2fe755192ae8354424087e (patch)
tree95dc9b0e5cfed4831393cc789fbadd5e3956e758
parent82108b6755e917230d55c51f7084f32b3336cdf1 (diff)
downloadpoky-97901ab12071017b7d2fe755192ae8354424087e.tar.gz
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. (From OE-Core rev: b729cae26de23ac6df10cbf74bab0105580cc43d) Signed-off-by: Andrej Valek <andrej.valek@siemens.com> Signed-off-by: Marko Peter <peter.marko@siemens.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-connectivity/openssl/openssl_1.1.0h.bb12
1 files changed, 11 insertions, 1 deletions
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() {
160 sed -i 's/$target{shared_extension_simple}/".so.ptest"/' ${D}${PTEST_PATH}/test/recipes/90-test_shlibload.t 160 sed -i 's/$target{shared_extension_simple}/".so.ptest"/' ${D}${PTEST_PATH}/test/recipes/90-test_shlibload.t
161} 161}
162 162
163PACKAGES =+ "${PN}-engines" 163PACKAGES =+ "libcrypto libssl ${PN}-misc ${PN}-engines openssl-conf"
164 164
165FILES_libcrypto = "${libdir}/libcrypto${SOLIBS}"
166FILES_libssl = "${libdir}/libssl${SOLIBS}"
165FILES_${PN} =+ "${libdir}/ssl-1.1/*" 167FILES_${PN} =+ "${libdir}/ssl-1.1/*"
166FILES_${PN}_append_class-nativesdk = " ${SDKPATHNATIVE}/environment-setup.d/openssl.sh" 168FILES_${PN}_append_class-nativesdk = " ${SDKPATHNATIVE}/environment-setup.d/openssl.sh"
167FILES_${PN}-engines = "${libdir}/engines-1.1" 169FILES_${PN}-engines = "${libdir}/engines-1.1"
168 170
171FILES_${PN}-misc = "${libdir}/ssl-1.1/misc"
172RDEPENDS_${PN}-misc = "${@bb.utils.filter('PACKAGECONFIG', 'perl', d)}"
173
174FILES_openssl-conf = "${libdir}/ssl-1.1/openssl.cnf"
175CONFFILES_openssl-conf = "${libdir}/ssl-1.1/openssl.cnf"
176RRECOMMENDS_libcrypto += "openssl-conf"
177
178RDEPENDS_${PN}-bin = "perl"
169RDEPENDS_${PN}-ptest += "perl-module-file-spec-functions bash python" 179RDEPENDS_${PN}-ptest += "perl-module-file-spec-functions bash python"
170 180
171BBCLASSEXTEND = "native nativesdk" 181BBCLASSEXTEND = "native nativesdk"