From cbac0f1bfc025d11aea74db16034e9589fbcffa6 Mon Sep 17 00:00:00 2001 From: Changqing Li Date: Thu, 6 Jun 2024 09:19:16 +0200 Subject: [PATCH] man-pages: remove conflict pages Remove the pages which libxcrypt and shadow already have to avoid following conflicts during install man-pages and libxcrypt/shadow at the same time. Error: Transaction test error: file /usr/share/man/man3/crypt.3 from install of libcrypt-doc-4.4.33-r0.x86_64 conflicts with file from package man-pages-6.04-r0.x86_64 (From OE-Core rev: fbc8f5381e8e1da0d06f7f8e5b8c63a49b1858c2) Signed-off-by: Changqing Li Signed-off-by: Alexandre Belloni Signed-off-by: Richard Purdie (cherry picked from commit 605b4a91dc44d33bd4742841e71645275bc039e8) Signed-off-by: Jonas Gorski Signed-off-by: Steve Sakoman --- meta/recipes-extended/man-pages/man-pages_5.13.bb | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/meta/recipes-extended/man-pages/man-pages_5.13.bb b/meta/recipes-extended/man-pages/man-pages_5.13.bb index f8602c699e..9afa9274a8 100644 --- a/meta/recipes-extended/man-pages/man-pages_5.13.bb +++ b/meta/recipes-extended/man-pages/man-pages_5.13.bb @@ -21,17 +21,12 @@ do_compile[noexec] = "1" do_install() { oe_runmake install prefix=${prefix} DESTDIR=${D} + rm -rf ${D}${mandir}/man3/crypt.3 + rm -rf ${D}${mandir}/man3/crypt_r.3 + rm -rf ${D}${mandir}/man3/getspnam.3 + rm -rf ${D}${mandir}/man5/passwd.5 } # Only deliveres man-pages so FILES:${PN} gets everything FILES:${PN}-doc = "" FILES:${PN} = "${mandir}/*" - -inherit update-alternatives - -ALTERNATIVE_PRIORITY = "100" -ALTERNATIVE:${PN} = "crypt.3 crypt_r.3 getspnam.3 passwd.5" -ALTERNATIVE_LINK_NAME[crypt.3] = "${mandir}/man3/crypt.3" -ALTERNATIVE_LINK_NAME[crypt_r.3] = "${mandir}/man3/crypt_r.3" -ALTERNATIVE_LINK_NAME[getspnam.3] = "${mandir}/man3/getspnam.3" -ALTERNATIVE_LINK_NAME[passwd.5] = "${mandir}/man5/passwd.5"