summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Vincent <freesilicon@gmail.com>2017-01-23 14:59:16 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-03-10 14:50:10 +0000
commit070f3aa74fba79c7fb981291c7c5d9234739bb12 (patch)
treee82535c1d8c5ffe446dc3ee4705621f73b517637
parent8dddce21c4613e3cda5ec5d3c83e6ed1d9ef44ea (diff)
downloadpoky-070f3aa74fba79c7fb981291c7c5d9234739bb12.tar.gz
openssl: Fix symlink creation
Symlinking the openssl configuration file at install time results in errors when overriding it using an external package which also provides openssl-conf. This should be done as a postinstall task for such packages. (From OE-Core rev: 991620f3962a9917fa99abb5582f4b72ebd42a3d) Signed-off-by: David Vincent <freesilicon@gmail.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-connectivity/openssl/openssl.inc13
1 files changed, 12 insertions, 1 deletions
diff --git a/meta/recipes-connectivity/openssl/openssl.inc b/meta/recipes-connectivity/openssl/openssl.inc
index 0b7991d1fd..9afa5bd567 100644
--- a/meta/recipes-connectivity/openssl/openssl.inc
+++ b/meta/recipes-connectivity/openssl/openssl.inc
@@ -201,7 +201,6 @@ do_install () {
201 ${D}${sysconfdir}/ssl/ 201 ${D}${sysconfdir}/ssl/
202 ln -sf ${sysconfdir}/ssl/certs ${D}${libdir}/ssl/certs 202 ln -sf ${sysconfdir}/ssl/certs ${D}${libdir}/ssl/certs
203 ln -sf ${sysconfdir}/ssl/private ${D}${libdir}/ssl/private 203 ln -sf ${sysconfdir}/ssl/private ${D}${libdir}/ssl/private
204 ln -sf ${sysconfdir}/ssl/openssl.cnf ${D}${libdir}/ssl/openssl.cnf
205} 204}
206 205
207do_install_ptest () { 206do_install_ptest () {
@@ -245,4 +244,16 @@ do_install_append_class-native() {
245 OPENSSL_ENGINES=${libdir}/ssl/engines 244 OPENSSL_ENGINES=${libdir}/ssl/engines
246} 245}
247 246
247pkg_postinst_openssl-conf () {
248#!/bin/sh
249if [ -e $D${libdir}/ssl/openssl.cnf ]; then
250 rm -f $D${libdir}/ssl/openssl.cnf
251fi
252
253# If openssl-conf is installed before openssl, we must ensure that the symlink
254# destination exists
255mkdir -p $D${libdir}/ssl/
256ln -s ${sysconfdir}/ssl/openssl.cnf $D${libdir}/ssl/openssl.cnf
257}
258
248BBCLASSEXTEND = "native nativesdk" 259BBCLASSEXTEND = "native nativesdk"