From: "akuster" <akuster808@gmail.com>
To: openembedded-core@lists.openembedded.org
Subject: [zeus 4/7] inetutils: Use alternatives to avoid manpage conflict
Date: Mon, 27 Apr 2020 19:15:53 -0700 [thread overview]
Message-ID: <1c2a1f29aa720d376bc7f88edfcb1ccecc35f6c2.1587931177.git.akuster808@gmail.com> (raw)
In-Reply-To: <cover.1587931177.git.akuster808@gmail.com>
From: Ovidiu Panait <ovidiu.panait@windriver.com>
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
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>
---
meta/recipes-connectivity/inetutils/inetutils_1.9.4.bb | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/meta/recipes-connectivity/inetutils/inetutils_1.9.4.bb b/meta/recipes-connectivity/inetutils/inetutils_1.9.4.bb
index 684fbe09e1c..cc9410b94e0 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"
ALTERNATIVE_${PN}-hostname = "hostname"
ALTERNATIVE_LINK_NAME[hostname] = "${base_bindir}/hostname"
-ALTERNATIVE_${PN}-doc = "hostname.1 dnsdomainname.1 logger.1 syslogd.8"
+ALTERNATIVE_${PN}-doc = "hostname.1 dnsdomainname.1 logger.1 syslogd.8 \
+ tftpd.8 tftp.1 telnetd.8"
ALTERNATIVE_LINK_NAME[hostname.1] = "${mandir}/man1/hostname.1"
ALTERNATIVE_LINK_NAME[dnsdomainname.1] = "${mandir}/man1/dnsdomainname.1"
ALTERNATIVE_LINK_NAME[logger.1] = "${mandir}/man1/logger.1"
ALTERNATIVE_LINK_NAME[syslogd.8] = "${mandir}/man8/syslogd.8"
+ALTERNATIVE_LINK_NAME[telnetd.8] = "${mandir}/man8/telnetd.8"
+ALTERNATIVE_LINK_NAME[tftpd.8] = "${mandir}/man8/tftpd.8"
+ALTERNATIVE_LINK_NAME[tftp.1] = "${mandir}/man1/tftp.1"
ALTERNATIVE_${PN}-ifconfig = "ifconfig"
ALTERNATIVE_LINK_NAME[ifconfig] = "${base_sbindir}/ifconfig"
--
2.17.1
next prev parent reply other threads:[~2020-04-28 2:16 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-04-28 2:15 [zeus 0/7] Merge request akuster
2020-04-28 2:15 ` [zeus 1/7] cve-check: CPE version '-' as all version akuster
2020-04-28 2:15 ` [zeus 2/7] pseudo: Ensure we use our own libsqlite akuster
2020-04-28 2:15 ` [zeus 3/7] wic: align layer plugin path akuster
2020-04-28 2:15 ` akuster [this message]
2020-04-28 2:15 ` [zeus 5/7] openssl: recommend cryptodev-module for corresponding PACKAGECONFIG akuster
2020-04-28 2:15 ` [zeus 6/7] openssl: Upgrade 1.1.1d -> 1.1.1e akuster
2020-04-28 2:15 ` [zeus 7/7] openssl: update to 1.1.1f akuster
2020-04-28 16:13 ` [OE-core] [zeus 0/7] Merge request Jan Luebbe
2020-04-28 17:09 ` akuster
2020-05-04 13:42 ` Jan Luebbe
2020-05-04 14:18 ` Steve Sakoman
2020-04-28 18:07 ` Martin Jansa
2020-04-29 4:35 ` Anuj Mittal
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1c2a1f29aa720d376bc7f88edfcb1ccecc35f6c2.1587931177.git.akuster808@gmail.com \
--to=akuster808@gmail.com \
--cc=openembedded-core@lists.openembedded.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox