diff options
| author | Changqing Li <changqing.li@windriver.com> | 2024-06-06 09:19:16 +0200 |
|---|---|---|
| committer | Steve Sakoman <steve@sakoman.com> | 2024-06-26 05:04:39 -0700 |
| commit | cbac0f1bfc025d11aea74db16034e9589fbcffa6 (patch) | |
| tree | 8191da75cc16d067704438917a5c20bdfa28c276 | |
| parent | 7c5fc9fedce4324ed4204764008db139b78e4450 (diff) | |
| download | poky-cbac0f1bfc025d11aea74db16034e9589fbcffa6.tar.gz | |
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 <changqing.li@windriver.com>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit 605b4a91dc44d33bd4742841e71645275bc039e8)
Signed-off-by: Jonas Gorski <jonas.gorski@bisdn.de>
Signed-off-by: Steve Sakoman <steve@sakoman.com>
| -rw-r--r-- | meta/recipes-extended/man-pages/man-pages_5.13.bb | 13 |
1 files 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" | |||
| 21 | 21 | ||
| 22 | do_install() { | 22 | do_install() { |
| 23 | oe_runmake install prefix=${prefix} DESTDIR=${D} | 23 | oe_runmake install prefix=${prefix} DESTDIR=${D} |
| 24 | rm -rf ${D}${mandir}/man3/crypt.3 | ||
| 25 | rm -rf ${D}${mandir}/man3/crypt_r.3 | ||
| 26 | rm -rf ${D}${mandir}/man3/getspnam.3 | ||
| 27 | rm -rf ${D}${mandir}/man5/passwd.5 | ||
| 24 | } | 28 | } |
| 25 | 29 | ||
| 26 | # Only deliveres man-pages so FILES:${PN} gets everything | 30 | # Only deliveres man-pages so FILES:${PN} gets everything |
| 27 | FILES:${PN}-doc = "" | 31 | FILES:${PN}-doc = "" |
| 28 | FILES:${PN} = "${mandir}/*" | 32 | FILES:${PN} = "${mandir}/*" |
| 29 | |||
| 30 | inherit update-alternatives | ||
| 31 | |||
| 32 | ALTERNATIVE_PRIORITY = "100" | ||
| 33 | ALTERNATIVE:${PN} = "crypt.3 crypt_r.3 getspnam.3 passwd.5" | ||
| 34 | ALTERNATIVE_LINK_NAME[crypt.3] = "${mandir}/man3/crypt.3" | ||
| 35 | ALTERNATIVE_LINK_NAME[crypt_r.3] = "${mandir}/man3/crypt_r.3" | ||
| 36 | ALTERNATIVE_LINK_NAME[getspnam.3] = "${mandir}/man3/getspnam.3" | ||
| 37 | ALTERNATIVE_LINK_NAME[passwd.5] = "${mandir}/man5/passwd.5" | ||
