[oe-commits] [openembedded-core] 12/33: openssl10: Fix conflict between openssl and openssl10 man pages.

[git at git.openembedded.org]

This is an automated email from the git hooks/post-receive script.

rpurdie pushed a commit to branch master-next
in repository openembedded-core.

commit bb837cae92472b294ac886b121b2249e4314439f
Author: Jason Wessel <jason.wessel at windriver.com>
AuthorDate: Tue Aug 15 09:10:51 2017 -0700

    openssl10: Fix conflict between openssl and openssl10 man pages.
    
    The package resolver failes to assemble images because some of the man
    pages in openssl10 conflict with the openssl package.  In the case
    where you want openssl, openssh and the documentation installed in the
    same system you will see the failure.
    
    The work around is to rename all the openssl10 man pages and symlinks
    to have a prefix of openssl10-.
    
    Signed-off-by: Jason Wessel <jason.wessel at windriver.com>
    Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
 meta/recipes-connectivity/openssl/openssl10.inc | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/meta/recipes-connectivity/openssl/openssl10.inc b/meta/recipes-connectivity/openssl/openssl10.inc
index c93d5d8..54cf459 100644
--- a/meta/recipes-connectivity/openssl/openssl10.inc
+++ b/meta/recipes-connectivity/openssl/openssl10.inc
@@ -199,6 +199,16 @@ do_install () {
 	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
+
+	# Rename man pages to prefix openssl10-*
+	for f in `find ${D}${mandir} -type f`; do
+	    mv $f $(dirname $f)/openssl10-$(basename $f)
+	done
+	for f in `find ${D}${mandir} -type l`; do
+	    ln_f=`readlink $f`
+	    rm -f $f
+	    ln -s openssl10-$ln_f $(dirname $f)/openssl10-$(basename $f)
+	done
 }
 
 do_install_ptest () {

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.