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:11:14 +0100 |
commit | 34d64f00ca46cff334c5cacb00380b03fcfeec26 (patch) | |
tree | 3e5841ad0b45b2932d686a7f5fcb59d86e2b55c0 /meta | |
parent | f8aa96e23f42af385b126f62d049272e37dab54c (diff) | |
download | poky-34d64f00ca46cff334c5cacb00380b03fcfeec26.tar.gz |
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>
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 | |||
99 | base_bindir_progs = "dnsdomainname domainname hostname netstat nisdomainname ypdomainname" | 99 | base_bindir_progs = "dnsdomainname domainname hostname netstat nisdomainname ypdomainname" |
100 | 100 | ||
101 | ALTERNATIVE_${PN} = "${base_sbindir_progs} ${base_bindir_progs}" | 101 | ALTERNATIVE_${PN} = "${base_sbindir_progs} ${base_bindir_progs}" |
102 | ALTERNATIVE_${PN}-doc += "hostname.1" | ||
103 | ALTERNATIVE_LINK_NAME[hostname.1] = "${mandir}/man1/hostname.1" | ||
104 | ALTERNATIVE_PRIORITY[hostname.1] = "10" | ||
105 | |||
102 | python __anonymous() { | 106 | python __anonymous() { |
103 | for prog in d.getVar('base_sbindir_progs', True).split(): | 107 | for prog in d.getVar('base_sbindir_progs', True).split(): |
104 | d.setVarFlag('ALTERNATIVE_LINK_NAME', prog, '%s/%s' % (d.getVar('base_sbindir', True), prog)) | 108 | d.setVarFlag('ALTERNATIVE_LINK_NAME', prog, '%s/%s' % (d.getVar('base_sbindir', True), prog)) |