summaryrefslogtreecommitdiff
path: root/meta
diff options
context:
space:
mode:
authorJussi Kukkonen <jussi.kukkonen@intel.com>2017-04-18 13:08:43 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-04-19 10:16:41 +0100
commitb192daef5d1e7f3501c533b92dc75e2d996afc13 (patch)
treeaf0f93234c3d00cd3d7cd2750ddeadc62592000f /meta
parentca798705b3b8fa9b2f6467970e9bda9d9433986c (diff)
downloadopenembedded-core-b192daef5d1e7f3501c533b92dc75e2d996afc13.tar.gz
openembedded-core-b192daef5d1e7f3501c533b92dc75e2d996afc13.tar.bz2
openembedded-core-b192daef5d1e7f3501c533b92dc75e2d996afc13.zip
Revert "openssl: Fix symlink creation"
This reverts commit 991620f3962a9917fa99abb5582f4b72ebd42a3d. The commit breaks openssl-native (you can no longer generate keys because it can't find the configuration file). Also the idea that we would install configuration files normally but then add the symlinks pointing to them in a postinstall feels wrong. Fixes [YOCTO #11296]. The bug contains an alternative fix but I'm sending a revert as I cannot fully understand the motive of the original patch. See also discussion in http://lists.openembedded.org/pipermail/openembedded-core/2017-April/135176.html Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-connectivity/openssl/openssl.inc13
1 files changed, 1 insertions, 12 deletions
diff --git a/meta/recipes-connectivity/openssl/openssl.inc b/meta/recipes-connectivity/openssl/openssl.inc
index c721d8c570..8f2a797b89 100644
--- a/meta/recipes-connectivity/openssl/openssl.inc
+++ b/meta/recipes-connectivity/openssl/openssl.inc
@@ -201,6 +201,7 @@ 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 () {
@@ -248,16 +249,4 @@ 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"