From 991620f3962a9917fa99abb5582f4b72ebd42a3d Mon Sep 17 00:00:00 2001 From: David Vincent Date: Mon, 23 Jan 2017 14:59:16 +0100 Subject: 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. Signed-off-by: David Vincent Signed-off-by: Ross Burton --- meta/recipes-connectivity/openssl/openssl.inc | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) (limited to 'meta/recipes-connectivity/openssl') 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 () { ${D}${sysconfdir}/ssl/ ln -sf ${sysconfdir}/ssl/certs ${D}${libdir}/ssl/certs ln -sf ${sysconfdir}/ssl/private ${D}${libdir}/ssl/private - ln -sf ${sysconfdir}/ssl/openssl.cnf ${D}${libdir}/ssl/openssl.cnf } do_install_ptest () { @@ -245,4 +244,16 @@ do_install_append_class-native() { OPENSSL_ENGINES=${libdir}/ssl/engines } +pkg_postinst_openssl-conf () { +#!/bin/sh +if [ -e $D${libdir}/ssl/openssl.cnf ]; then + rm -f $D${libdir}/ssl/openssl.cnf +fi + +# If openssl-conf is installed before openssl, we must ensure that the symlink +# destination exists +mkdir -p $D${libdir}/ssl/ +ln -s ${sysconfdir}/ssl/openssl.cnf $D${libdir}/ssl/openssl.cnf +} + BBCLASSEXTEND = "native nativesdk" -- cgit 1.2.3-korg