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
Signed-off-by: Paul Gortmaker <paul.gortma...@windriver.com>
---
meta/recipes-extended/which/which_2.21.bb | 3 +++
meta/recipes-support/debianutils/debianutils_4.8.1.bb | 3 +++
2 files changed, 6 insertions(+)
diff --git a/meta/recipes-extended/which/which_2.21.bb
b/meta/recipes-extended/which/which_2.21.bb
index a7687f6fe43c..fac0fd3944b6 100644
--- a/meta/recipes-extended/which/which_2.21.bb
+++ b/meta/recipes-extended/which/which_2.21.bb
@@ -30,3 +30,6 @@ do_configure_prepend() {
ALTERNATIVE_${PN} = "which"
ALTERNATIVE_PRIORITY = "100"
+
+ALTERNATIVE_${PN}-doc = "which.1"
+ALTERNATIVE_LINK_NAME[which.1] = "${mandir}/man1/which.1"
diff --git a/meta/recipes-support/debianutils/debianutils_4.8.1.bb
b/meta/recipes-support/debianutils/debianutils_4.8.1.bb
index 54c74e097c03..54c345ea25f6 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"
ALTERNATIVE_${PN} = "add-shell installkernel remove-shell savelog tempfile
which"
ALTERNATIVE_${PN}-run-parts = "run-parts"
+ALTERNATIVE_${PN}-doc = "which.1"
+ALTERNATIVE_LINK_NAME[which.1] = "${mandir}/man1/which.1"
+
ALTERNATIVE_LINK_NAME[add-shell]="${sbindir}/add-shell"
ALTERNATIVE_LINK_NAME[installkernel]="${sbindir}/installkernel"
ALTERNATIVE_LINK_NAME[remove-shell]="${sbindir}/remove-shell"
--
2.7.4
--
_______________________________________________
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
