diff options
| author | Dai Caiyun <daicy.fnst@cn.fujitsu.com> | 2016-02-28 02:05:53 +0300 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-05-22 16:11:14 +0100 |
| commit | 96b1eb4e6d0795455fca77eb06ec45e43902e690 (patch) | |
| tree | eb4725e5f8d9e877c02d3ff810bff749d42be7ec /meta/recipes-core/coreutils/coreutils_6.9.bb | |
| parent | 34d64f00ca46cff334c5cacb00380b03fcfeec26 (diff) | |
| download | poky-96b1eb4e6d0795455fca77eb06ec45e43902e690.tar.gz | |
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>
Diffstat (limited to 'meta/recipes-core/coreutils/coreutils_6.9.bb')
| -rw-r--r-- | meta/recipes-core/coreutils/coreutils_6.9.bb | 4 |
1 files changed, 4 insertions, 0 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" | |||
| 88 | 88 | ||
| 89 | ALTERNATIVE_${PN} = "lbracket ${bindir_progs} ${base_bindir_progs} ${sbindir_progs}" | 89 | ALTERNATIVE_${PN} = "lbracket ${bindir_progs} ${base_bindir_progs} ${sbindir_progs}" |
| 90 | 90 | ||
| 91 | ALTERNATIVE_${PN}-doc = "su.1 hostname.1" | ||
| 92 | ALTERNATIVE_LINK_NAME[su.1] = "${mandir}/man1/su.1" | ||
| 93 | ALTERNATIVE_LINK_NAME[hostname.1] = "${mandir}/man1/hostname.1" | ||
| 94 | |||
| 91 | ALTERNATIVE_PRIORITY[uptime] = "10" | 95 | ALTERNATIVE_PRIORITY[uptime] = "10" |
| 92 | ALTERNATIVE_PRIORITY[hostname] = "10" | 96 | ALTERNATIVE_PRIORITY[hostname] = "10" |
| 93 | 97 | ||