[gnome-continuous-yocto/gnomeostree-3.28-rocko: 479/8267] net-tools: Fix rootfs creation errors
- From: Emmanuele Bassi <ebassi src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-continuous-yocto/gnomeostree-3.28-rocko: 479/8267] net-tools: Fix rootfs creation errors
- Date: Sat, 16 Dec 2017 20:29:05 +0000 (UTC)
commit 34d64f00ca46cff334c5cacb00380b03fcfeec26
Author: Dai Caiyun <daicy fnst cn fujitsu com>
Date: 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
(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>
.../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 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))
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]