To fix:
file /usr/share/man/man1/dnsdomainname.1 conflicts between attempted installs
of inetutils-doc-1.9.4-r0.core2_64 and net-tools-doc-1.60+26-r0.core2_64
Signed-off-by: Paul Gortmaker <paul.gortma...@windriver.com>
---
meta/recipes-extended/net-tools/net-tools_1.60-26.bb | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/meta/recipes-extended/net-tools/net-tools_1.60-26.bb
b/meta/recipes-extended/net-tools/net-tools_1.60-26.bb
index 49a65f873a91..99a42359b817 100644
--- a/meta/recipes-extended/net-tools/net-tools_1.60-26.bb
+++ b/meta/recipes-extended/net-tools/net-tools_1.60-26.bb
@@ -101,8 +101,9 @@ base_sbindir_progs = "arp ifconfig ipmaddr iptunnel
mii-tool nameif plipconfig r
base_bindir_progs = "dnsdomainname domainname hostname netstat nisdomainname
ypdomainname"
ALTERNATIVE_${PN} = "${base_sbindir_progs} ${base_bindir_progs}"
-ALTERNATIVE_${PN}-doc += "hostname.1"
+ALTERNATIVE_${PN}-doc += "hostname.1 dnsdomainname.1"
ALTERNATIVE_LINK_NAME[hostname.1] = "${mandir}/man1/hostname.1"
+ALTERNATIVE_LINK_NAME[dnsdomainname.1] = "${mandir}/man1/dnsdomainname.1"
ALTERNATIVE_PRIORITY[hostname.1] = "10"
python __anonymous() {
--
2.7.4
--
_______________________________________________
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
