summaryrefslogtreecommitdiffstats
path: root/meta/recipes-connectivity
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:18:43 +0100
commit7fe30a5df4ad25275492f241a69553693af1fd3f (patch)
tree3d0c01ccd1297388188bbe0c228fd36793aa6d05 /meta/recipes-connectivity
parentd31eead2af88a66734c212f5338b13e6573608ee (diff)
downloadpoky-7fe30a5df4ad25275492f241a69553693af1fd3f.tar.gz
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 (From OE-Core rev: b192daef5d1e7f3501c533b92dc75e2d996afc13) Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-connectivity')
-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 () {
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
204} 205}
205 206
206do_install_ptest () { 207do_install_ptest () {
@@ -248,16 +249,4 @@ do_install_append_class-native() {
248 OPENSSL_ENGINES=${libdir}/ssl/engines 249 OPENSSL_ENGINES=${libdir}/ssl/engines
249} 250}
250 251
251pkg_postinst_openssl-conf () {
252#!/bin/sh
253if [ -e $D${libdir}/ssl/openssl.cnf ]; then
254 rm -f $D${libdir}/ssl/openssl.cnf
255fi
256
257# If openssl-conf is installed before openssl, we must ensure that the symlink
258# destination exists
259mkdir -p $D${libdir}/ssl/
260ln -s ${sysconfdir}/ssl/openssl.cnf $D${libdir}/ssl/openssl.cnf
261}
262
263BBCLASSEXTEND = "native nativesdk" 252BBCLASSEXTEND = "native nativesdk"