From: Dai Caiyun Date: Sat, 27 Feb 2016 23:03:12 +0000 (+0300) Subject: shadow: Fix rootfs creation errors X-Git-Tag: lucaceresoli/bug-15201-perf-libtraceevent-missing~25698 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=52d3d9e1ab0b510d93c4915baf2a85b9cc949205;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git shadow: Fix rootfs creation errors 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 Signed-off-by: Dai Caiyun Signed-off-by: Ross Burton --- diff --git a/meta/recipes-extended/shadow/shadow.inc b/meta/recipes-extended/shadow/shadow.inc index d024b01dcb2..5605876988c 100644 --- a/meta/recipes-extended/shadow/shadow.inc +++ b/meta/recipes-extended/shadow/shadow.inc @@ -179,10 +179,11 @@ ALTERNATIVE_${PN}-base = "newgrp groups login su" ALTERNATIVE_LINK_NAME[login] = "${base_bindir}/login" ALTERNATIVE_LINK_NAME[su] = "${base_bindir}/su" -ALTERNATIVE_${PN}-doc = "passwd.5 getspnam.3 groups.1" +ALTERNATIVE_${PN}-doc = "passwd.5 getspnam.3 groups.1 su.1" ALTERNATIVE_LINK_NAME[passwd.5] = "${mandir}/man5/passwd.5" ALTERNATIVE_LINK_NAME[getspnam.3] = "${mandir}/man3/getspnam.3" ALTERNATIVE_LINK_NAME[groups.1] = "${mandir}/man1/groups.1" +ALTERNATIVE_LINK_NAME[su.1] = "${mandir}/man1/su.1" pkg_postinst_${PN} () { if [ "x$D" != "x" ]; then