aboutsummaryrefslogtreecommitdiffstats
path: root/meta/recipes-extended
diff options
context:
space:
mode:
authormark asselstine <masselst@yow-cube2.wrs.com>2018-12-20 10:34:54 -0500
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-01-03 21:14:47 +0000
commitc4e0034cd1f020cfb074c7c80af281683752afeb (patch)
tree74a86292f2a434bd647c5b02c22d57e60077ef19 /meta/recipes-extended
parentfb79b109a9562a31faf42a62fd161e63ec43a231 (diff)
downloadopenembedded-core-contrib-c4e0034cd1f020cfb074c7c80af281683752afeb.tar.gz
openembedded-core-contrib-c4e0034cd1f020cfb074c7c80af281683752afeb.tar.bz2
openembedded-core-contrib-c4e0034cd1f020cfb074c7c80af281683752afeb.zip
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>
Diffstat (limited to 'meta/recipes-extended')
-rw-r--r--meta/recipes-extended/man-pages/man-pages_4.16.bb3
1 files changed, 2 insertions, 1 deletions
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"