]> code.ossystems Code Review - openembedded-core.git/commit
man-pages/shadow: resolve man pages confliction
authorHongxu Jia <hongxu.jia@windriver.com>
Wed, 29 Oct 2014 05:54:49 +0000 (13:54 +0800)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Wed, 31 Dec 2014 10:17:12 +0000 (10:17 +0000)
commit222e5c9202cb4d20ee8f9f2b9845a5922811e9fc
tree0aa27e282679414c50955f17c2305a00e22df575
parent986e7f4a937bb21115ed56d981baa863365487ea
man-pages/shadow: resolve man pages confliction

Invoke smart/rpm to install man-pages and shadow-doc, there
is a build failure:
...
|error: file /usr/share/man/man5/passwd.5 from install of
shadow-doc-4.2.1-r0.0.core2_64 conflicts with file from
package man-pages-3.70-r0.0.core2_64
|error: file /usr/share/man/man3/getspnam.3 from install of
shadow-doc-4.2.1-r0.0.core2_64 conflicts with file from
package man-pages-3.70-r0.0.core2_64
...
Use alternatives mechanism to fix it.

As README in man-pages said: "Note that sometimes these
pages are duplicates of pages also distributed in other
packages. Be careful not to overwrite more up-to-date
versions. So we set man-pages with lower priority.

[YOCTO #6769]

(From OE-Core rev: 32357da67fa640bc0c14048af1d7b8dbbe8e775e)

Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
meta/recipes-extended/man-pages/man-pages_3.71.bb
meta/recipes-extended/shadow/shadow.inc