[gnome-continuous-yocto/gnomeostree-3.28-rocko: 7221/8267] openssl10: Fix conflict between openssl and openssl10 man pages.
- From: Emmanuele Bassi <ebassi src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-continuous-yocto/gnomeostree-3.28-rocko: 7221/8267] openssl10: Fix conflict between openssl and openssl10 man pages.
- Date: Sun, 17 Dec 2017 05:56:38 +0000 (UTC)
commit 5c4bb85e071c353e432a515bfd698297d5a8c333
Author: Jason Wessel <jason wessel windriver com>
Date: 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-.
(From OE-Core rev: bb837cae92472b294ac886b121b2249e4314439f)
Signed-off-by: Jason Wessel <jason wessel windriver com>
Signed-off-by: Richard Purdie <richard purdie linuxfoundation org>
meta/recipes-connectivity/openssl/openssl10.inc | 10 ++++++++++
1 files changed, 10 insertions(+), 0 deletions(-)
---
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 () {
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]