[OE-core] [PATCH] shadow: Fix rootfs creation errors
Dai Caiyun
daicy.fnst at cn.fujitsu.com
Fri May 20 01:58:52 UTC 2016
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 <daicy.fnst at cn.fujitsu.com>
---
meta/recipes-extended/shadow/shadow.inc | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/meta/recipes-extended/shadow/shadow.inc b/meta/recipes-extended/shadow/shadow.inc
index d024b01..5605876 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
--
1.8.4.2
More information about the Openembedded-core
mailing list