]> git.ipfire.org Git - thirdparty/openembedded/openembedded-core-contrib.git/commitdiff
net-tools: use update-alternatives for more manpages
authorPaul Gortmaker <paul.gortmaker@windriver.com>
Thu, 16 Mar 2017 14:20:55 +0000 (10:20 -0400)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Fri, 17 Mar 2017 11:55:24 +0000 (11:55 +0000)
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.gortmaker@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
meta/recipes-extended/net-tools/net-tools_1.60-26.bb

index 49a65f873a912dfb75eadb55f5a0071d9e49ba13..99a42359b81726f04399d74232fa21fd39933643 100644 (file)
@@ -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() {