summaryrefslogtreecommitdiffstats
path: root/meta/recipes-extended/shadow
diff options
context:
space:
mode:
authorHongxu Jia <hongxu.jia@windriver.com>2014-10-29 13:54:49 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-12-31 10:18:35 +0000
commita6d7512b5e7c1ade1dd841d4a40ac3ac89e6388d (patch)
treeef9ee795ba4e358816ea6ac5b3a8305a43649082 /meta/recipes-extended/shadow
parent637580101cb4f2c3497e3dfd07454fa550a6b7c4 (diff)
downloadpoky-a6d7512b5e7c1ade1dd841d4a40ac3ac89e6388d.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) (From OE-Core rev: 222e5c9202cb4d20ee8f9f2b9845a5922811e9fc) 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> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-extended/shadow')
-rw-r--r--meta/recipes-extended/shadow/shadow.inc4
1 files changed, 4 insertions, 0 deletions
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"
159ALTERNATIVE_LINK_NAME[vigr] = "${base_sbindir}/vigr" 159ALTERNATIVE_LINK_NAME[vigr] = "${base_sbindir}/vigr"
160ALTERNATIVE_LINK_NAME[su] = "${base_bindir}/su" 160ALTERNATIVE_LINK_NAME[su] = "${base_bindir}/su"
161 161
162ALTERNATIVE_${PN}-doc = "passwd.5 getspnam.3"
163ALTERNATIVE_LINK_NAME[passwd.5] = "${mandir}/man5/passwd.5"
164ALTERNATIVE_LINK_NAME[getspnam.3] = "${mandir}/man3/getspnam.3"
165
162pkg_postinst_${PN} () { 166pkg_postinst_${PN} () {
163 if [ "x$D" != "x" ]; then 167 if [ "x$D" != "x" ]; then
164 rootarg="--root $D" 168 rootarg="--root $D"