diff options
author | Paul Gortmaker <paul.gortmaker@windriver.com> | 2017-03-16 10:20:53 -0400 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-03-17 16:53:04 +0000 |
commit | 4a660aa437228b39befe04335a0d6f4e21ed5d2a (patch) | |
tree | 9117ffe5fa64f732f13a3740abb5e3e34db45252 /meta/recipes-support | |
parent | 5686689408fbdb863ea63ae0dd30029a54901b39 (diff) | |
download | poky-4a660aa437228b39befe04335a0d6f4e21ed5d2a.tar.gz |
which: fix it so the manpage will respect alternatives
To fix:
file /usr/share/man/man1/which.1 conflicts between attempted installs
of debianutils-doc-4.8.1-r0.core2_64 and which-doc-2.21-r3.core2_64
(From OE-Core rev: ba304046307cd741694b25215b562d5f05c9c7a5)
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-support')
-rw-r--r-- | meta/recipes-support/debianutils/debianutils_4.8.1.bb | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/meta/recipes-support/debianutils/debianutils_4.8.1.bb b/meta/recipes-support/debianutils/debianutils_4.8.1.bb index 54c74e097c..54c345ea25 100644 --- a/meta/recipes-support/debianutils/debianutils_4.8.1.bb +++ b/meta/recipes-support/debianutils/debianutils_4.8.1.bb | |||
@@ -40,6 +40,9 @@ ALTERNATIVE_PRIORITY="30" | |||
40 | ALTERNATIVE_${PN} = "add-shell installkernel remove-shell savelog tempfile which" | 40 | ALTERNATIVE_${PN} = "add-shell installkernel remove-shell savelog tempfile which" |
41 | ALTERNATIVE_${PN}-run-parts = "run-parts" | 41 | ALTERNATIVE_${PN}-run-parts = "run-parts" |
42 | 42 | ||
43 | ALTERNATIVE_${PN}-doc = "which.1" | ||
44 | ALTERNATIVE_LINK_NAME[which.1] = "${mandir}/man1/which.1" | ||
45 | |||
43 | ALTERNATIVE_LINK_NAME[add-shell]="${sbindir}/add-shell" | 46 | ALTERNATIVE_LINK_NAME[add-shell]="${sbindir}/add-shell" |
44 | ALTERNATIVE_LINK_NAME[installkernel]="${sbindir}/installkernel" | 47 | ALTERNATIVE_LINK_NAME[installkernel]="${sbindir}/installkernel" |
45 | ALTERNATIVE_LINK_NAME[remove-shell]="${sbindir}/remove-shell" | 48 | ALTERNATIVE_LINK_NAME[remove-shell]="${sbindir}/remove-shell" |