summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDai Caiyun <daicy.fnst@cn.fujitsu.com>2016-02-28 02:05:53 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-05-22 16:09:22 +0100
commit6cc65261169c9d4da61a85596e3f7864699d50d0 (patch)
tree22133387c8e66e1723e0fc1d406a5d6ab8a47083
parent4c98c19d5e16193efbf6865ed53369f9ef61d9a0 (diff)
downloadopenembedded-core-contrib-6cc65261169c9d4da61a85596e3f7864699d50d0.tar.gz
openembedded-core-contrib-6cc65261169c9d4da61a85596e3f7864699d50d0.tar.bz2
openembedded-core-contrib-6cc65261169c9d4da61a85596e3f7864699d50d0.zip
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 Signed-off-by: Dai Caiyun <daicy.fnst@cn.fujitsu.com> Signed-off-by: Ross Burton <ross.burton@intel.com>
-rw-r--r--meta/recipes-core/coreutils/coreutils_6.9.bb4
-rw-r--r--meta/recipes-core/coreutils/coreutils_8.25.bb4
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 9ce717d1aa..35700a32fd 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 b1aaf539fb..245969d2b4 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}"