[gnome-continuous-yocto/gnomeostree-3.28-rocko: 480/8267] coreutils: Fix rootfs creation errors

[Emmanuele Bassi <ebassi src gnome org>]

commit 96b1eb4e6d0795455fca77eb06ec45e43902e690
Author: Dai Caiyun <daicy fnst cn fujitsu com>
Date:   Sun Feb 28 02:05:53 2016 +0300

    coreutils: Fix rootfs creation errors
    
        1) error: file /usr/share/man/man1/su.1 from install of shadow-doc-4.2.1
           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-6.9-r5
        3) 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: 6cc65261169c9d4da61a85596e3f7864699d50d0)
    
    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>

 meta/recipes-core/coreutils/coreutils_6.9.bb  |    4 ++++
 meta/recipes-core/coreutils/coreutils_8.25.bb |    4 +++-
 2 files changed, 7 insertions(+), 1 deletions(-)
---
diff --git a/meta/recipes-core/coreutils/coreutils_6.9.bb b/meta/recipes-core/coreutils/coreutils_6.9.bb
index 9ce717d..35700a3 100644
--- a/meta/recipes-core/coreutils/coreutils_6.9.bb
+++ b/meta/recipes-core/coreutils/coreutils_6.9.bb
@@ -88,6 +88,10 @@ ALTERNATIVE_PRIORITY = "100"
 
 ALTERNATIVE_${PN} = "lbracket ${bindir_progs} ${base_bindir_progs} ${sbindir_progs}"
 
+ALTERNATIVE_${PN}-doc = "su.1 hostname.1"
+ALTERNATIVE_LINK_NAME[su.1] = "${mandir}/man1/su.1"
+ALTERNATIVE_LINK_NAME[hostname.1] = "${mandir}/man1/hostname.1"
+
 ALTERNATIVE_PRIORITY[uptime] = "10"
 ALTERNATIVE_PRIORITY[hostname] = "10"
 
diff --git a/meta/recipes-core/coreutils/coreutils_8.25.bb b/meta/recipes-core/coreutils/coreutils_8.25.bb
index b1aaf53..245969d 100644
--- a/meta/recipes-core/coreutils/coreutils_8.25.bb
+++ b/meta/recipes-core/coreutils/coreutils_8.25.bb
@@ -104,7 +104,9 @@ inherit update-alternatives
 
 ALTERNATIVE_PRIORITY = "100"
 ALTERNATIVE_${PN} = "lbracket ${bindir_progs} ${base_bindir_progs} ${sbindir_progs} base64 mktemp df"
-ALTERNATIVE_${PN}-doc = "base64.1 mktemp.1 df.1 lbracket.1 groups.1 kill.1 uptime.1 stat.1"
+ALTERNATIVE_${PN}-doc = "base64.1 mktemp.1 df.1 lbracket.1 groups.1 kill.1 uptime.1 stat.1  hostname.1"
+
+ALTERNATIVE_LINK_NAME[hostname.1] = "${mandir}/man1/hostname.1"
 
 ALTERNATIVE_LINK_NAME[base64] = "${base_bindir}/base64"
 ALTERNATIVE_TARGET[base64] = "${bindir}/base64.${BPN}"