diff options
| author | mark asselstine <masselst@yow-cube2.wrs.com> | 2018-12-20 10:34:54 -0500 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-01-03 21:16:00 +0000 |
| commit | 535abb934a1be52090a11d65984a4ca6681c13be (patch) | |
| tree | 15cd48da3fa208e9654e6cd00d51e83639018b54 /meta/recipes-extended/man-pages | |
| parent | efdeb09cf376680c7b00205c3e0afa835543bf46 (diff) | |
| download | poky-535abb934a1be52090a11d65984a4ca6681c13be.tar.gz | |
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].
(From OE-Core rev: c4e0034cd1f020cfb074c7c80af281683752afeb)
Signed-off-by: Mark Asselstine <mark.asselstine@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-extended/man-pages')
| -rw-r--r-- | meta/recipes-extended/man-pages/man-pages_4.16.bb | 3 |
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}/*" | |||
| 31 | inherit update-alternatives | 31 | inherit update-alternatives |
| 32 | 32 | ||
| 33 | ALTERNATIVE_PRIORITY = "100" | 33 | ALTERNATIVE_PRIORITY = "100" |
| 34 | ALTERNATIVE_${PN} = "passwd.5 getspnam.3" | 34 | ALTERNATIVE_${PN} = "passwd.5 getspnam.3 crypt.3" |
| 35 | ALTERNATIVE_LINK_NAME[passwd.5] = "${mandir}/man5/passwd.5" | 35 | ALTERNATIVE_LINK_NAME[passwd.5] = "${mandir}/man5/passwd.5" |
| 36 | ALTERNATIVE_LINK_NAME[getspnam.3] = "${mandir}/man3/getspnam.3" | 36 | ALTERNATIVE_LINK_NAME[getspnam.3] = "${mandir}/man3/getspnam.3" |
| 37 | ALTERNATIVE_LINK_NAME[crypt.3] = "${mandir}/man3/crypt.3" | ||