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@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

diff --git a/meta/recipes-connectivity/openssl/openssl10.inc b/meta/recipes-connectivity/openssl/openssl10.inc
index c93d5d8738104ae2e3df8dcee390a2cbe668d5f5..54cf4598e1d6b741450ae4b3272de0ce79169349 100644 (file)
--- 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 () {