]> git.ipfire.org Git - thirdparty/openembedded/openembedded-core.git/commitdiff
shadow: Fix rootfs creation errors
authorDai Caiyun <daicy.fnst@cn.fujitsu.com>
Sat, 27 Feb 2016 23:03:12 +0000 (02:03 +0300)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Sun, 22 May 2016 15:09:21 +0000 (16:09 +0100)
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@cn.fujitsu.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
meta/recipes-extended/shadow/shadow.inc

index d024b01dcb2adfae26892d4e8d4e6c8e1a25c61c..5605876988cff9661fdef0da7a31182ec1e881b2 100644 (file)
@@ -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