sysmo-bts
/
generic-poky
9
0
Fork 0
Code Pull Requests Releases Activity

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

(From OE-Core rev: 4c98c19d5e16193efbf6865ed53369f9ef61d9a0)

Signed-off-by: Dai Caiyun <daicy.fnst@cn.fujitsu.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Dai Caiyun 2016-02-28 02:03:45 +03:00 committed by Richard Purdie
parent f8aa96e23f
commit 34d64f00ca
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
meta/recipes-extended/net-tools/net-tools_1.60-26.bb
View File

@ -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))