summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Gortmaker <paul.gortmaker@windriver.com>2017-03-16 10:20:55 -0400
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-03-17 16:53:04 +0000
commit33162228c65e09ebc6cbc617cdafe7c3344d19dc (patch)
tree6f4147145a09fb9ef7faabb390224c3d397e5e98
parentc6532a199a93a5b04864a5d5094a1071d05cc3be (diff)
downloadpoky-33162228c65e09ebc6cbc617cdafe7c3344d19dc.tar.gz
net-tools: use update-alternatives for more manpages
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 (From OE-Core rev: 412d6b31b23b30f71b8acf2ecd37463f770cd8be) Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-extended/net-tools/net-tools_1.60-26.bb3
1 files changed, 2 insertions, 1 deletions
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 49a65f873a..99a42359b8 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
101base_bindir_progs = "dnsdomainname domainname hostname netstat nisdomainname ypdomainname" 101base_bindir_progs = "dnsdomainname domainname hostname netstat nisdomainname ypdomainname"
102 102
103ALTERNATIVE_${PN} = "${base_sbindir_progs} ${base_bindir_progs}" 103ALTERNATIVE_${PN} = "${base_sbindir_progs} ${base_bindir_progs}"
104ALTERNATIVE_${PN}-doc += "hostname.1" 104ALTERNATIVE_${PN}-doc += "hostname.1 dnsdomainname.1"
105ALTERNATIVE_LINK_NAME[hostname.1] = "${mandir}/man1/hostname.1" 105ALTERNATIVE_LINK_NAME[hostname.1] = "${mandir}/man1/hostname.1"
106ALTERNATIVE_LINK_NAME[dnsdomainname.1] = "${mandir}/man1/dnsdomainname.1"
106ALTERNATIVE_PRIORITY[hostname.1] = "10" 107ALTERNATIVE_PRIORITY[hostname.1] = "10"
107 108
108python __anonymous() { 109python __anonymous() {