[oe-commits] [openembedded-core] 03/03: openssl-1.1: /etc/ssl location compatibility

[git at git.openembedded.org]

This is an automated email from the git hooks/post-receive script.

rpurdie pushed a commit to branch master-next
in repository openembedded-core.

commit 492fdd7d1b06541537ad4456938f98c50a9a43ab
Author: Andrej Valek <andrej.valek at siemens.com>
AuthorDate: Tue Jul 17 11:10:35 2018 +0200

    openssl-1.1: /etc/ssl location compatibility
    
    Some packages have hard-coded path to /etc/ssl location.
    Create a symlinks to correct location.
    
    Signed-off-by: Andrej Valek <andrej.valek at siemens.com>
    Signed-off-by: Marko Peter <peter.marko at siemens.com>
    Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
 meta/recipes-connectivity/openssl/openssl_1.1.0h.bb | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/meta/recipes-connectivity/openssl/openssl_1.1.0h.bb b/meta/recipes-connectivity/openssl/openssl_1.1.0h.bb
index 4f80a80..8b3d922 100644
--- a/meta/recipes-connectivity/openssl/openssl_1.1.0h.bb
+++ b/meta/recipes-connectivity/openssl/openssl_1.1.0h.bb
@@ -24,7 +24,7 @@ SRC_URI_append_class-nativesdk = " \
 SRC_URI[md5sum] = "5271477e4d93f4ea032b665ef095ff24"
 SRC_URI[sha256sum] = "5835626cde9e99656585fc7aaa2302a73a7e1340bf8c14fd635a62c66802a517"
 
-inherit lib_package multilib_header ptest
+inherit lib_package multilib_header ptest relative_symlinks
 
 #| engines/afalg/e_afalg.c: In function 'eventfd':
 #| engines/afalg/e_afalg.c:110:20: error: '__NR_eventfd' undeclared (first use in this function)
@@ -135,6 +135,18 @@ do_configure () {
 do_install () {
 	oe_runmake DESTDIR="${D}" MANDIR="${mandir}" MANSUFFIX=ssl install
 	oe_multilib_header openssl/opensslconf.h
+
+	# Create SSL structure for PATH hard-coded packages like ca-certificates
+	# Debian is also using this technique
+	install -d ${D}${sysconfdir}/ssl/
+	mv ${D}${libdir}/ssl-1.1/openssl.cnf \
+		${D}${libdir}/ssl-1.1/certs \
+		${D}${libdir}/ssl-1.1/private \
+		\
+		${D}${sysconfdir}/ssl/
+	ln -sf ${sysconfdir}/ssl/certs ${D}${libdir}/ssl-1.1/certs
+	ln -sf ${sysconfdir}/ssl/private ${D}${libdir}/ssl-1.1/private
+	ln -sf ${sysconfdir}/ssl/openssl.cnf ${D}${libdir}/ssl-1.1/openssl.cnf
 }
 
 do_install_append_class-native () {
@@ -171,8 +183,8 @@ 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"
+FILES_openssl-conf = "${sysconfdir}/ssl/openssl.cnf ${libdir}/ssl-1.1/openssl.cnf"
+CONFFILES_openssl-conf = "${sysconfdir}/ssl/openssl.cnf"
 RRECOMMENDS_libcrypto += "openssl-conf"
 
 RDEPENDS_${PN}-bin = "perl"

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.