From: mark asselstine <masselst@yow-cube2.wrs.com>
Date: Thu, 20 Dec 2018 15:34:54 +0000 (-0500)
Subject: man-pages: use alternatives to resolve crypt.3 conflict
X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=a2cc838d868e5f842e8839198317953533582fdd;p=openembedded-core.git

man-pages: use alternatives to resolve crypt.3 conflict

To fix:

  Error: Transaction check error:
    file /usr/share/man/man3/crypt.3 conflicts between attempted installs
    of libcrypt-doc-4.4.1-r0.core2_64 and man-pages-4.16-r0.core2_64

This issue came about after commit 59be9254df9f [libxcrypt: Upgrade to
4.4.1 release].

Signed-off-by: Mark Asselstine <mark.asselstine@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---

diff --git a/meta/recipes-extended/man-pages/man-pages_4.16.bb b/meta/recipes-extended/man-pages/man-pages_4.16.bb
index a64587cf0b..1f14c891b5 100644
--- a/meta/recipes-extended/man-pages/man-pages_4.16.bb
+++ b/meta/recipes-extended/man-pages/man-pages_4.16.bb
@@ -31,6 +31,7 @@ FILES_${PN} = "${mandir}/*"
 inherit update-alternatives
 
 ALTERNATIVE_PRIORITY = "100"
-ALTERNATIVE_${PN} = "passwd.5 getspnam.3"
+ALTERNATIVE_${PN} = "passwd.5 getspnam.3 crypt.3"
 ALTERNATIVE_LINK_NAME[passwd.5] = "${mandir}/man5/passwd.5"
 ALTERNATIVE_LINK_NAME[getspnam.3] = "${mandir}/man3/getspnam.3"
+ALTERNATIVE_LINK_NAME[crypt.3] = "${mandir}/man3/crypt.3"