summaryrefslogtreecommitdiffstats
path: root/meta-networking/recipes-connectivity
diff options
context:
space:
mode:
authorPaul Gortmaker <paul.gortmaker@windriver.com>2017-03-16 10:29:53 -0400
committerJoe MacDonald <joe_macdonald@mentor.com>2017-03-24 14:10:18 -0400
commit762d1eb305fba89836f2912e4c077105373f30ea (patch)
tree6f53ed6beb4cfec4af3d010648ae855c32347cef /meta-networking/recipes-connectivity
parentc6a894f808a0d43aa79eb2c71ca5cfa94ac31d02 (diff)
downloadmeta-openembedded-762d1eb305fba89836f2912e4c077105373f30ea.tar.gz
inetutils: 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 file /usr/share/man/man8/syslogd.8 conflicts between attempted installs of inetutils-doc-1.9.4-r0.core2_64 and sysklogd-doc-1.5.1-r0.core2_64 file /usr/share/man/man1/logger.1 conflicts between attempted installs of util-linux-doc-2.29.1-r0.core2_64 and inetutils-doc-1.9.4-r0.core2_64 Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> Signed-off-by: Joe MacDonald <joe_macdonald@mentor.com>
Diffstat (limited to 'meta-networking/recipes-connectivity')
-rw-r--r--meta-networking/recipes-connectivity/inetutils/inetutils_1.9.4.bb5
1 files changed, 4 insertions, 1 deletions
diff --git a/meta-networking/recipes-connectivity/inetutils/inetutils_1.9.4.bb b/meta-networking/recipes-connectivity/inetutils/inetutils_1.9.4.bb
index 045d7e5b4..4655bc577 100644
--- a/meta-networking/recipes-connectivity/inetutils/inetutils_1.9.4.bb
+++ b/meta-networking/recipes-connectivity/inetutils/inetutils_1.9.4.bb
@@ -146,8 +146,11 @@ ALTERNATIVE_${PN}-traceroute = "traceroute"
146ALTERNATIVE_${PN}-hostname = "hostname" 146ALTERNATIVE_${PN}-hostname = "hostname"
147ALTERNATIVE_LINK_NAME[hostname] = "${base_bindir}/hostname" 147ALTERNATIVE_LINK_NAME[hostname] = "${base_bindir}/hostname"
148 148
149ALTERNATIVE_${PN}-doc = "hostname.1" 149ALTERNATIVE_${PN}-doc = "hostname.1 dnsdomainname.1 logger.1 syslogd.8"
150ALTERNATIVE_LINK_NAME[hostname.1] = "${mandir}/man1/hostname.1" 150ALTERNATIVE_LINK_NAME[hostname.1] = "${mandir}/man1/hostname.1"
151ALTERNATIVE_LINK_NAME[dnsdomainname.1] = "${mandir}/man1/dnsdomainname.1"
152ALTERNATIVE_LINK_NAME[logger.1] = "${mandir}/man1/logger.1"
153ALTERNATIVE_LINK_NAME[syslogd.8] = "${mandir}/man8/syslogd.8"
151 154
152ALTERNATIVE_${PN}-ifconfig = "ifconfig" 155ALTERNATIVE_${PN}-ifconfig = "ifconfig"
153ALTERNATIVE_LINK_NAME[ifconfig] = "${base_sbindir}/ifconfig" 156ALTERNATIVE_LINK_NAME[ifconfig] = "${base_sbindir}/ifconfig"