Openembedded Core Discussions
 help / color / mirror / Atom feed
From: Andrej Valek <andrej.valek@siemens.com>
To: openembedded-core@lists.openembedded.org
Subject: [PATCH v3 2/2] openssl-1.1: /etc/ssl location compatibility
Date: Fri,  8 Jun 2018 16:04:03 +0200	[thread overview]
Message-ID: <20180608140403.27855-2-andrej.valek@siemens.com> (raw)
In-Reply-To: <20180608140403.27855-1-andrej.valek@siemens.com>
In-Reply-To: <24e47452-9ff5-778c-5146-599589458a3f@linux.intel.com>

Some packages has hard-coded path to /etc/ssl location.
Create a symlinks to correct location.

Signed-off-by: Andrej Valek <andrej.valek@siemens.com>
Signed-off-by: Marko Peter <peter.marko@siemens.com>
---
 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 c8e0255b33..bef03c574e 100644
--- a/meta/recipes-connectivity/openssl/openssl_1.1.0h.bb
+++ b/meta/recipes-connectivity/openssl/openssl_1.1.0h.bb
@@ -22,7 +22,7 @@ SRC_URI = "http://www.openssl.org/source/openssl-${PV}.tar.gz \
 
 S = "${WORKDIR}/openssl-${PV}"
 
-inherit lib_package multilib_header ptest
+inherit lib_package multilib_header ptest relative_symlinks
 
 do_configure () {
 	os=${HOST_OS}
@@ -133,6 +133,18 @@ EXTRA_OECONF_libc-musl += "-DOPENSSL_NO_ASYNC"
 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 () {
@@ -162,6 +174,6 @@ FILES_${PN} =+ " ${libdir}/ssl-1.1/*"
 FILES_${PN}-misc = "${libdir}/ssl-1.1/misc"
 RDEPENDS_${PN}-misc = "${@bb.utils.filter('PACKAGECONFIG', 'perl', d)}"
 FILES_${PN}-engines = "${libdir}/engines-1.1"
-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"
+CONFFILES_openssl-conf = "${sysconfdir}/ssl/openssl.cnf"
 RRECOMMENDS_libcrypto += "openssl-conf"
-- 
2.11.0



      parent reply	other threads:[~2018-06-08 14:04 UTC|newest]

Thread overview: 21+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-06-07  7:25 [PATCH] feat(openssl-1.1): rework packaging Andrej Valek
2018-06-07  7:32 ` [PATCH v2] " Andrej Valek
2018-06-07 13:13   ` Alexander Kanavin
2018-06-07 13:26     ` Alexander Kanavin
2018-06-08  6:33     ` Andrej Valek
2018-06-08  7:48       ` Andrej Valek
2018-06-08  9:48         ` Alexander Kanavin
2018-06-08 11:31           ` Andrej Valek
2018-06-08 11:47             ` Alexander Kanavin
2018-06-08 14:04               ` [PATCH v3 1/2] openssl-1.1: " Andrej Valek
2018-06-08 15:57                 ` Alexander Kanavin
2018-06-11  6:19                   ` Andrej Valek
2018-06-11 12:45                     ` Alexander Kanavin
2018-06-11 17:54                       ` Peter Kjellerstedt
2018-06-11 18:15                         ` Alexander Kanavin
2018-06-11 13:30                 ` [PATCH v4 1/3] openssl-1.1: fix c_rehash perl errors Andrej Valek
2018-06-11 13:30                 ` [PATCH v4 2/3] openssl-1.1: rework packaging Andrej Valek
2018-06-11 13:30                 ` [PATCH v4 3/3] openssl-1.1: /etc/ssl location compatibility Andrej Valek
2018-07-09 12:06                   ` Andrej Valek
2018-07-09 12:44                     ` Alexander Kanavin
2018-06-08 14:04               ` Andrej Valek [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20180608140403.27855-2-andrej.valek@siemens.com \
    --to=andrej.valek@siemens.com \
    --cc=openembedded-core@lists.openembedded.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox