From c4e0034cd1f020cfb074c7c80af281683752afeb Mon Sep 17 00:00:00 2001 From: mark asselstine Date: Thu, 20 Dec 2018 10:34:54 -0500 Subject: 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 Signed-off-by: Richard Purdie --- 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 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" -- cgit 1.2.3-korg