diff options
| author | Dai Caiyun <daicy.fnst@cn.fujitsu.com> | 2016-02-28 02:03:12 +0300 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-05-22 16:09:21 +0100 |
| commit | 52d3d9e1ab0b510d93c4915baf2a85b9cc949205 (patch) | |
| tree | 5470e3861869794ce6018de79a93360dfc649f9c /meta | |
| parent | 6993e88cccbfe2f990e4ea9bd7cc186d59e5a84b (diff) | |
| download | openembedded-core-52d3d9e1ab0b510d93c4915baf2a85b9cc949205.tar.gz openembedded-core-52d3d9e1ab0b510d93c4915baf2a85b9cc949205.tar.bz2 openembedded-core-52d3d9e1ab0b510d93c4915baf2a85b9cc949205.zip | |
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 <daicy.fnst@cn.fujitsu.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Diffstat (limited to 'meta')
| -rw-r--r-- | meta/recipes-extended/shadow/shadow.inc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/meta/recipes-extended/shadow/shadow.inc b/meta/recipes-extended/shadow/shadow.inc index d024b01dcb..5605876988 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 |