diff mbox series

[V3] man-pages: remove conflict pages

Message ID 20231221054415.1516863-1-changqing.li@windriver.com
State Accepted, archived
Commit 605b4a91dc44d33bd4742841e71645275bc039e8
Headers show
Series [V3] man-pages: remove conflict pages | expand

Commit Message

Changqing Li Dec. 21, 2023, 5:44 a.m. UTC 
From: Changqing Li <changqing.li@windriver.com>

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

Signed-off-by: Changqing Li <changqing.li@windriver.com>
---
 .../recipes-extended/man-pages/man-pages_6.05.01.bb | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)
diff mbox series

Patch

diff --git a/meta/recipes-extended/man-pages/man-pages_6.05.01.bb b/meta/recipes-extended/man-pages/man-pages_6.05.01.bb
index 2726eded8b..f0eb1a6132 100644
--- a/meta/recipes-extended/man-pages/man-pages_6.05.01.bb
+++ b/meta/recipes-extended/man-pages/man-pages_6.05.01.bb
@@ -30,17 +30,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"