]> code.ossystems Code Review - openembedded-core.git/commit
cpio: avoid conflict with tar-doc and rmt.8
authorMark Asselstine <mark.asselstine@windriver.com>
Tue, 26 Feb 2019 17:10:35 +0000 (12:10 -0500)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Wed, 27 Feb 2019 18:03:44 +0000 (18:03 +0000)
commit692d5b1025450bf1c33fb6aa041603f082e2ba4d
tree6c611b4f566c02eb7f07cd08aba6874bdb9d6321
parente6f1d15e307a8d2f5f05c9ec9dd8163e9072ad07
cpio: avoid conflict with tar-doc and rmt.8

This fixes:
    Error: Transaction check error:
      file /usr/share/man/man8/rmt.8 conflicts between attempted installs of
      cpio-doc-2.12-r0.core2_64 and tar-doc-1.31-r0.core2_64

Prior to commit 348a96a5b401 [tar: upgrade to 1.31] the copies of
rmt.8 found in the tar(-doc) and cpio(-doc) packages were the same and
thus no conflict was seen. After the upgrade there were small changes
in the manpage header which results in the conflict quoted above. The
applications themselves make use of the 'update-alternatives'
mechanism to allow a user to select which version of 'rmt' to use but
since the man pages are essentially the same we disambiguate the
source of the man pages and make them both available should both
cpio-doc and tar-doc are both installed. And as such we avoid the
conflict.

Signed-off-by: Mark Asselstine <mark.asselstine@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
meta/recipes-extended/cpio/cpio_2.12.bb