diff options
| author | Dai Caiyun <daicy.fnst@cn.fujitsu.com> | 2016-02-28 02:03:45 +0300 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-05-22 16:09:21 +0100 |
| commit | 4c98c19d5e16193efbf6865ed53369f9ef61d9a0 (patch) | |
| tree | e9938100161bfa03a4cd78b6ef557a0e8778044a /meta | |
| parent | 52d3d9e1ab0b510d93c4915baf2a85b9cc949205 (diff) | |
| download | openembedded-core-4c98c19d5e16193efbf6865ed53369f9ef61d9a0.tar.gz openembedded-core-4c98c19d5e16193efbf6865ed53369f9ef61d9a0.tar.bz2 openembedded-core-4c98c19d5e16193efbf6865ed53369f9ef61d9a0.zip | |
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@cn.fujitsu.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Diffstat (limited to 'meta')
| -rw-r--r-- | meta/recipes-extended/net-tools/net-tools_1.60-26.bb | 4 |
1 files changed, 4 insertions, 0 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 63b2051bad..759de0a700 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)) |