From: Dai Caiyun Date: Sat, 27 Feb 2016 23:03:45 +0000 (+0300) Subject: net-tools: Fix rootfs creation errors X-Git-Tag: lucaceresoli/bug-15201-perf-libtraceevent-missing~25697 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4c98c19d5e16193efbf6865ed53369f9ef61d9a0;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git 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 Signed-off-by: Ross Burton --- 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 63b2051bad5..759de0a7005 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))