summaryrefslogtreecommitdiffstats
path: root/meta/recipes-connectivity
diff options
context:
space:
mode:
authorJason Wessel <jason.wessel@windriver.com>2017-08-15 09:10:51 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-08-17 00:21:14 +0100
commit5c4bb85e071c353e432a515bfd698297d5a8c333 (patch)
tree7af9987b7b8626421dd006622a3ce0814f999c92 /meta/recipes-connectivity
parente6d78cf73aea60d42edab5c0a9c77a705a6abf33 (diff)
downloadpoky-5c4bb85e071c353e432a515bfd698297d5a8c333.tar.gz
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-. (From OE-Core rev: bb837cae92472b294ac886b121b2249e4314439f) Signed-off-by: Jason Wessel <jason.wessel@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-connectivity')
-rw-r--r--meta/recipes-connectivity/openssl/openssl10.inc10
1 files changed, 10 insertions, 0 deletions
diff --git a/meta/recipes-connectivity/openssl/openssl10.inc b/meta/recipes-connectivity/openssl/openssl10.inc
index c93d5d8738..54cf4598e1 100644
--- a/meta/recipes-connectivity/openssl/openssl10.inc
+++ b/meta/recipes-connectivity/openssl/openssl10.inc
@@ -199,6 +199,16 @@ do_install () {
199 ln -sf ${sysconfdir}/ssl/certs ${D}${libdir}/ssl/certs 199 ln -sf ${sysconfdir}/ssl/certs ${D}${libdir}/ssl/certs
200 ln -sf ${sysconfdir}/ssl/private ${D}${libdir}/ssl/private 200 ln -sf ${sysconfdir}/ssl/private ${D}${libdir}/ssl/private
201 ln -sf ${sysconfdir}/ssl/openssl.cnf ${D}${libdir}/ssl/openssl.cnf 201 ln -sf ${sysconfdir}/ssl/openssl.cnf ${D}${libdir}/ssl/openssl.cnf
202
203 # Rename man pages to prefix openssl10-*
204 for f in `find ${D}${mandir} -type f`; do
205 mv $f $(dirname $f)/openssl10-$(basename $f)
206 done
207 for f in `find ${D}${mandir} -type l`; do
208 ln_f=`readlink $f`
209 rm -f $f
210 ln -s openssl10-$ln_f $(dirname $f)/openssl10-$(basename $f)
211 done
202} 212}
203 213
204do_install_ptest () { 214do_install_ptest () {