diff options
| author |   Hongxu Jia <hongxu.jia@windriver.com> | 2014-10-29 13:54:49 +0800 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-12-31 10:17:12 +0000 |
| commit | 222e5c9202cb4d20ee8f9f2b9845a5922811e9fc (patch) | |
| tree | 0aa27e282679414c50955f17c2305a00e22df575 | |
| parent | 986e7f4a937bb21115ed56d981baa863365487ea (diff) | |
| download | openembedded-core-contrib-222e5c9202cb4d20ee8f9f2b9845a5922811e9fc.tar.gz | |
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>
| -rw-r--r-- | meta/recipes-extended/man-pages/man-pages_3.71.bb | 7 | ||||
| -rw-r--r-- | meta/recipes-extended/shadow/shadow.inc | 4 |
2 files changed, 11 insertions, 0 deletions
diff --git a/meta/recipes-extended/man-pages/man-pages_3.71.bb b/meta/recipes-extended/man-pages/man-pages_3.71.bb index 759bad540c..225b2567cb 100644 --- a/meta/recipes-extended/man-pages/man-pages_3.71.bb +++ b/meta/recipes-extended/man-pages/man-pages_3.71.bb @@ -27,3 +27,10 @@ do_install() { # Only deliveres man-pages so FILES_${PN} gets everything FILES_${PN}-doc = "" FILES_${PN} = "${mandir}/*" + +inherit update-alternatives + +ALTERNATIVE_PRIORITY = "100" +ALTERNATIVE_${PN} = "passwd.5 getspnam.3" +ALTERNATIVE_LINK_NAME[passwd.5] = "${mandir}/man5/passwd.5" +ALTERNATIVE_LINK_NAME[getspnam.3] = "${mandir}/man3/getspnam.3" diff --git a/meta/recipes-extended/shadow/shadow.inc b/meta/recipes-extended/shadow/shadow.inc index 131e541d29..14c7281f53 100644 --- a/meta/recipes-extended/shadow/shadow.inc +++ b/meta/recipes-extended/shadow/shadow.inc @@ -159,6 +159,10 @@ ALTERNATIVE_LINK_NAME[vipw] = "${base_sbindir}/vipw" ALTERNATIVE_LINK_NAME[vigr] = "${base_sbindir}/vigr" ALTERNATIVE_LINK_NAME[su] = "${base_bindir}/su" +ALTERNATIVE_${PN}-doc = "passwd.5 getspnam.3" +ALTERNATIVE_LINK_NAME[passwd.5] = "${mandir}/man5/passwd.5" +ALTERNATIVE_LINK_NAME[getspnam.3] = "${mandir}/man3/getspnam.3" + pkg_postinst_${PN} () { if [ "x$D" != "x" ]; then rootarg="--root $D" |