diff options
Diffstat (limited to 'meta/recipes-connectivity/openssl/openssl_1.1.1a.bb')
-rw-r--r-- | meta/recipes-connectivity/openssl/openssl_1.1.1a.bb | 14 |
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 | ||
14 | SRC_URI = "http://www.openssl.org/source/openssl-${PV}.tar.gz \ | 14 | SRC_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 | ||
161 | do_install_append_class-nativesdk () { | 154 | do_install_append_class-nativesdk () { |
@@ -197,14 +190,13 @@ FILES_libcrypto = "${libdir}/libcrypto${SOLIBS}" | |||
197 | FILES_libssl = "${libdir}/libssl${SOLIBS}" | 190 | FILES_libssl = "${libdir}/libssl${SOLIBS}" |
198 | FILES_openssl-conf = "${sysconfdir}/ssl/openssl.cnf" | 191 | FILES_openssl-conf = "${sysconfdir}/ssl/openssl.cnf" |
199 | FILES_${PN}-engines = "${libdir}/engines-1.1" | 192 | FILES_${PN}-engines = "${libdir}/engines-1.1" |
200 | FILES_${PN}-misc = "${libdir}/ssl-1.1/misc ${bindir}/c_rehash" | 193 | FILES_${PN}-misc = "${libdir}/ssl-1.1/misc" |
201 | FILES_${PN} =+ "${libdir}/ssl-1.1/*" | 194 | FILES_${PN} =+ "${libdir}/ssl-1.1/*" |
202 | FILES_${PN}_append_class-nativesdk = " ${SDKPATHNATIVE}/environment-setup.d/openssl.sh" | 195 | FILES_${PN}_append_class-nativesdk = " ${SDKPATHNATIVE}/environment-setup.d/openssl.sh" |
203 | 196 | ||
204 | CONFFILES_openssl-conf = "${sysconfdir}/ssl/openssl.cnf" | 197 | CONFFILES_openssl-conf = "${sysconfdir}/ssl/openssl.cnf" |
205 | 198 | ||
206 | RRECOMMENDS_libcrypto += "openssl-conf" | 199 | RRECOMMENDS_libcrypto += "openssl-conf" |
207 | RDEPENDS_${PN}-misc = "perl" | ||
208 | RDEPENDS_${PN}-ptest += "openssl-bin perl perl-modules bash" | 200 | RDEPENDS_${PN}-ptest += "openssl-bin perl perl-modules bash" |
209 | 201 | ||
210 | RPROVIDES_openssl-conf = "openssl10-conf" | 202 | RPROVIDES_openssl-conf = "openssl10-conf" |
@@ -212,7 +204,3 @@ RREPLACES_openssl-conf = "openssl10-conf" | |||
212 | RCONFLICTS_openssl-conf = "openssl10-conf" | 204 | RCONFLICTS_openssl-conf = "openssl10-conf" |
213 | 205 | ||
214 | BBCLASSEXTEND = "native nativesdk" | 206 | BBCLASSEXTEND = "native nativesdk" |
215 | |||
216 | inherit multilib_script | ||
217 | |||
218 | MULTILIB_SCRIPTS = "${PN}-bin:${bindir}/c_rehash" | ||