From a189a28dc105ff3f85c1a99591f305897b5770af Mon Sep 17 00:00:00 2001 From: Mark Asselstine Date: Tue, 26 Feb 2019 12:10:35 -0500 Subject: 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. (From OE-Core rev: 692d5b1025450bf1c33fb6aa041603f082e2ba4d) Signed-off-by: Mark Asselstine Signed-off-by: Richard Purdie --- meta/recipes-extended/cpio/cpio_2.12.bb | 3 +++ 1 file changed, 3 insertions(+) (limited to 'meta/recipes-extended/cpio') diff --git a/meta/recipes-extended/cpio/cpio_2.12.bb b/meta/recipes-extended/cpio/cpio_2.12.bb index 6ba8337e5d..cb845c3070 100644 --- a/meta/recipes-extended/cpio/cpio_2.12.bb +++ b/meta/recipes-extended/cpio/cpio_2.12.bb @@ -27,6 +27,9 @@ do_install () { mv "${D}${bindir}/cpio" "${D}${base_bindir}/cpio" rmdir ${D}${bindir}/ fi + + # Avoid conflicts with the version from tar + mv "${D}${mandir}/man8/rmt.8" "${D}${mandir}/man8/rmt-cpio.8" } PACKAGES =+ "${PN}-rmt" -- cgit v1.2.3-54-g00ecf