summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOvidiu Panait <ovidiu.panait@windriver.com>2020-04-01 09:48:06 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2020-04-29 16:11:56 +0100
commit3d0865c905d28912f3d355dc4d2b04f42f579616 (patch)
treecc0ba7db7b8964b58c5b7698ea3ef0ab8470a6ec
parent51586b5612cfba9bc9928dcf1837a90a7f2d50f8 (diff)
downloadpoky-3d0865c905d28912f3d355dc4d2b04f42f579616.tar.gz
inetutils: Use alternatives to avoid manpage conflict
Fix the following manpage conflicts: * check_data_file_clashes: Package inetutils-doc wants to install file /usr/share/man/man1/tftp.1 But that file is already provided by package * tftp-hpa-doc * check_data_file_clashes: Package inetutils-doc wants to install file /usr/share/man/man8/tftpd.8 But that file is already provided by package * tftp-hpa-doc * check_data_file_clashes: Package netkit-telnet-doc wants to install file /usr/share/man/man8/telnetd.8 But that file is already provided by package * inetutils-doc (From OE-Core rev: 1c2a1f29aa720d376bc7f88edfcb1ccecc35f6c2) Signed-off-by: Ovidiu Panait <ovidiu.panait@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> (cherry picked from commit fc14bfd60ad86094f65ebefbd10dbddc112d2698) Signed-off-by: Armin Kuster <akuster808@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-connectivity/inetutils/inetutils_1.9.4.bb6
1 files changed, 5 insertions, 1 deletions
diff --git a/meta/recipes-connectivity/inetutils/inetutils_1.9.4.bb b/meta/recipes-connectivity/inetutils/inetutils_1.9.4.bb
index 684fbe09e1..cc9410b94e 100644
--- a/meta/recipes-connectivity/inetutils/inetutils_1.9.4.bb
+++ b/meta/recipes-connectivity/inetutils/inetutils_1.9.4.bb
@@ -143,11 +143,15 @@ ALTERNATIVE_${PN}-traceroute = "traceroute"
143ALTERNATIVE_${PN}-hostname = "hostname" 143ALTERNATIVE_${PN}-hostname = "hostname"
144ALTERNATIVE_LINK_NAME[hostname] = "${base_bindir}/hostname" 144ALTERNATIVE_LINK_NAME[hostname] = "${base_bindir}/hostname"
145 145
146ALTERNATIVE_${PN}-doc = "hostname.1 dnsdomainname.1 logger.1 syslogd.8" 146ALTERNATIVE_${PN}-doc = "hostname.1 dnsdomainname.1 logger.1 syslogd.8 \
147 tftpd.8 tftp.1 telnetd.8"
147ALTERNATIVE_LINK_NAME[hostname.1] = "${mandir}/man1/hostname.1" 148ALTERNATIVE_LINK_NAME[hostname.1] = "${mandir}/man1/hostname.1"
148ALTERNATIVE_LINK_NAME[dnsdomainname.1] = "${mandir}/man1/dnsdomainname.1" 149ALTERNATIVE_LINK_NAME[dnsdomainname.1] = "${mandir}/man1/dnsdomainname.1"
149ALTERNATIVE_LINK_NAME[logger.1] = "${mandir}/man1/logger.1" 150ALTERNATIVE_LINK_NAME[logger.1] = "${mandir}/man1/logger.1"
150ALTERNATIVE_LINK_NAME[syslogd.8] = "${mandir}/man8/syslogd.8" 151ALTERNATIVE_LINK_NAME[syslogd.8] = "${mandir}/man8/syslogd.8"
152ALTERNATIVE_LINK_NAME[telnetd.8] = "${mandir}/man8/telnetd.8"
153ALTERNATIVE_LINK_NAME[tftpd.8] = "${mandir}/man8/tftpd.8"
154ALTERNATIVE_LINK_NAME[tftp.1] = "${mandir}/man1/tftp.1"
151 155
152ALTERNATIVE_${PN}-ifconfig = "ifconfig" 156ALTERNATIVE_${PN}-ifconfig = "ifconfig"
153ALTERNATIVE_LINK_NAME[ifconfig] = "${base_sbindir}/ifconfig" 157ALTERNATIVE_LINK_NAME[ifconfig] = "${base_sbindir}/ifconfig"