[gnome-continuous-yocto/gnomeostree-3.28-rocko: 5151/8267] net-tools: use update-alternatives for more manpages
- From: Emmanuele Bassi <ebassi src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-continuous-yocto/gnomeostree-3.28-rocko: 5151/8267] net-tools: use update-alternatives for more manpages
- Date: Sun, 17 Dec 2017 03:02:14 +0000 (UTC)
commit 33162228c65e09ebc6cbc617cdafe7c3344d19dc
Author: Paul Gortmaker <paul gortmaker windriver com>
Date: Thu Mar 16 10:20:55 2017 -0400
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>
.../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 49a65f8..99a4235 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() {
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]