[oe-commits] [openembedded-core] 12/20: net-tools: Fix rootfs creation errors

[git at git.openembedded.org]

rpurdie pushed a commit to branch master-next
in repository openembedded-core.

commit 1a16f8402c5d3e9f64b488f2bea2d7e1a85e3c4d
Author: Dai Caiyun <daicy.fnst at cn.fujitsu.com>
AuthorDate: Sun Feb 28 02:03:45 2016 +0300

    net-tools: Fix rootfs creation errors
    
    1) error: file /usr/share/man/man1/hostname.1 from install of net-tools-doc
               conflicts with file from package coreutils-doc-6.9-r5
    2) error: file /usr/share/man/man1/hostname.1 from install of net-tools-doc
               conflicts with file from package coreutils-doc-8.25
    
    Signed-off-by: Dai Caiyun <daicy.fnst at cn.fujitsu.com>
    Signed-off-by: Ross Burton <ross.burton at intel.com>
---
 meta/recipes-extended/net-tools/net-tools_1.60-26.bb | 4 ++++
 1 file changed, 4 insertions(+)

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 63b2051..759de0a 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
@@ -99,6 +99,10 @@ 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_LINK_NAME[hostname.1] = "${mandir}/man1/hostname.1"
+ALTERNATIVE_PRIORITY[hostname.1] = "10"
+
 python __anonymous() {
 	for prog in d.getVar('base_sbindir_progs', True).split():
 		d.setVarFlag('ALTERNATIVE_LINK_NAME', prog, '%s/%s' % (d.getVar('base_sbindir', True), prog))

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.