summaryrefslogtreecommitdiffstats
path: root/meta/recipes-connectivity/openssl/openssl_1.1.1a.bb
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-connectivity/openssl/openssl_1.1.1a.bb')
-rw-r--r--meta/recipes-connectivity/openssl/openssl_1.1.1a.bb14
1 files changed, 1 insertions, 13 deletions
diff --git a/meta/recipes-connectivity/openssl/openssl_1.1.1a.bb b/meta/recipes-connectivity/openssl/openssl_1.1.1a.bb
index 5c5e291c1b..2e536e5d2a 100644
--- a/meta/recipes-connectivity/openssl/openssl_1.1.1a.bb
+++ b/meta/recipes-connectivity/openssl/openssl_1.1.1a.bb
@@ -13,7 +13,6 @@ DEPENDS = "hostperl-runtime-native"
13 13
14SRC_URI = "http://www.openssl.org/source/openssl-${PV}.tar.gz \ 14SRC_URI = "http://www.openssl.org/source/openssl-${PV}.tar.gz \
15 file://run-ptest \ 15 file://run-ptest \
16 file://openssl-c_rehash.sh \
17 file://0001-skip-test_symbol_presence.patch \ 16 file://0001-skip-test_symbol_presence.patch \
18 file://0001-buildinfo-strip-sysroot-and-debug-prefix-map-from-co.patch \ 17 file://0001-buildinfo-strip-sysroot-and-debug-prefix-map-from-co.patch \
19 file://afalg.patch \ 18 file://afalg.patch \
@@ -150,12 +149,6 @@ do_install_append_class-native () {
150 SSL_CERT_DIR=${libdir}/ssl-1.1/certs \ 149 SSL_CERT_DIR=${libdir}/ssl-1.1/certs \
151 SSL_CERT_FILE=${libdir}/ssl-1.1/cert.pem \ 150 SSL_CERT_FILE=${libdir}/ssl-1.1/cert.pem \
152 OPENSSL_ENGINES=${libdir}/ssl-1.1/engines 151 OPENSSL_ENGINES=${libdir}/ssl-1.1/engines
153
154 # Install a custom version of c_rehash that can handle sysroots properly.
155 # This version is used for example when installing ca-certificates during
156 # image creation.
157 install -Dm 0755 ${WORKDIR}/openssl-c_rehash.sh ${D}${bindir}/c_rehash
158 sed -i -e 's,/etc/openssl,${sysconfdir}/ssl,g' ${D}${bindir}/c_rehash
159} 152}
160 153
161do_install_append_class-nativesdk () { 154do_install_append_class-nativesdk () {
@@ -197,14 +190,13 @@ FILES_libcrypto = "${libdir}/libcrypto${SOLIBS}"
197FILES_libssl = "${libdir}/libssl${SOLIBS}" 190FILES_libssl = "${libdir}/libssl${SOLIBS}"
198FILES_openssl-conf = "${sysconfdir}/ssl/openssl.cnf" 191FILES_openssl-conf = "${sysconfdir}/ssl/openssl.cnf"
199FILES_${PN}-engines = "${libdir}/engines-1.1" 192FILES_${PN}-engines = "${libdir}/engines-1.1"
200FILES_${PN}-misc = "${libdir}/ssl-1.1/misc ${bindir}/c_rehash" 193FILES_${PN}-misc = "${libdir}/ssl-1.1/misc"
201FILES_${PN} =+ "${libdir}/ssl-1.1/*" 194FILES_${PN} =+ "${libdir}/ssl-1.1/*"
202FILES_${PN}_append_class-nativesdk = " ${SDKPATHNATIVE}/environment-setup.d/openssl.sh" 195FILES_${PN}_append_class-nativesdk = " ${SDKPATHNATIVE}/environment-setup.d/openssl.sh"
203 196
204CONFFILES_openssl-conf = "${sysconfdir}/ssl/openssl.cnf" 197CONFFILES_openssl-conf = "${sysconfdir}/ssl/openssl.cnf"
205 198
206RRECOMMENDS_libcrypto += "openssl-conf" 199RRECOMMENDS_libcrypto += "openssl-conf"
207RDEPENDS_${PN}-misc = "perl"
208RDEPENDS_${PN}-ptest += "openssl-bin perl perl-modules bash" 200RDEPENDS_${PN}-ptest += "openssl-bin perl perl-modules bash"
209 201
210RPROVIDES_openssl-conf = "openssl10-conf" 202RPROVIDES_openssl-conf = "openssl10-conf"
@@ -212,7 +204,3 @@ RREPLACES_openssl-conf = "openssl10-conf"
212RCONFLICTS_openssl-conf = "openssl10-conf" 204RCONFLICTS_openssl-conf = "openssl10-conf"
213 205
214BBCLASSEXTEND = "native nativesdk" 206BBCLASSEXTEND = "native nativesdk"
215
216inherit multilib_script
217
218MULTILIB_SCRIPTS = "${PN}-bin:${bindir}/c_rehash"