[oe-commits] [openembedded-core] 04/09: man-pages: use alternatives to resolve crypt.3 conflict

[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 a2cc838d868e5f842e8839198317953533582fdd
Author: mark asselstine <masselst at yow-cube2.wrs.com>
AuthorDate: Thu Dec 20 10:34:54 2018 -0500

    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 at windriver.com>
    Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
 meta/recipes-extended/man-pages/man-pages_4.16.bb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

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 a64587c..1f14c89 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"

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