diff options
| author | Paul Gortmaker <paul.gortmaker@windriver.com> | 2017-03-16 10:20:55 -0400 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-03-17 11:55:24 +0000 |
| commit | 412d6b31b23b30f71b8acf2ecd37463f770cd8be (patch) | |
| tree | b41d5ac1030731dc325ad233c66914cbe212d78a | |
| parent | a65e69d006bceacb042b377f2cd0dd8a3e72ea62 (diff) | |
| download | openembedded-core-412d6b31b23b30f71b8acf2ecd37463f770cd8be.tar.gz openembedded-core-412d6b31b23b30f71b8acf2ecd37463f770cd8be.tar.bz2 openembedded-core-412d6b31b23b30f71b8acf2ecd37463f770cd8be.zip | |
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
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.bb | 3 |
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 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() { |