[OE-core] [PATCH] Revert "openssl: Fix symlink creation"

[Martin Jansa]

On Tue, Apr 18, 2017 at 01:08:43PM +0300, Jussi Kukkonen wrote:
> 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 at intel.com>

Acked-by: Martin Jansa <Martin.Jansa at gmail.com>

> ---
>  meta/recipes-connectivity/openssl/openssl.inc | 13 +------------
>  1 file changed, 1 insertion(+), 12 deletions(-)
> 
> diff --git a/meta/recipes-connectivity/openssl/openssl.inc b/meta/recipes-connectivity/openssl/openssl.inc
> index c721d8c..8f2a797 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"
> -- 
> 2.1.4
> 
> -- 
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core at lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core

-- 
Martin 'JaMa' Jansa     jabber: Martin.Jansa at gmail.com
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 195 bytes
Desc: Digital signature
URL: <http://lists.openembedded.org/pipermail/openembedded-core/attachments/20170418/b8cf78b7/attachment-0002.sig>