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:11:14 +0100 |
commit | f8aa96e23f42af385b126f62d049272e37dab54c (patch) | |
tree | ae40441fdc5911a769c760fbcb92f5b8a06311f9 /meta | |
parent | b414b50c76c7d0c3d211cd46746bef097360a262 (diff) | |
download | poky-f8aa96e23f42af385b126f62d049272e37dab54c.tar.gz |
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
(From OE-Core rev: 52d3d9e1ab0b510d93c4915baf2a85b9cc949205)
Signed-off-by: Dai Caiyun <daicy.fnst@cn.fujitsu.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
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" | |||
179 | ALTERNATIVE_LINK_NAME[login] = "${base_bindir}/login" | 179 | ALTERNATIVE_LINK_NAME[login] = "${base_bindir}/login" |
180 | ALTERNATIVE_LINK_NAME[su] = "${base_bindir}/su" | 180 | ALTERNATIVE_LINK_NAME[su] = "${base_bindir}/su" |
181 | 181 | ||
182 | ALTERNATIVE_${PN}-doc = "passwd.5 getspnam.3 groups.1" | 182 | ALTERNATIVE_${PN}-doc = "passwd.5 getspnam.3 groups.1 su.1" |
183 | ALTERNATIVE_LINK_NAME[passwd.5] = "${mandir}/man5/passwd.5" | 183 | ALTERNATIVE_LINK_NAME[passwd.5] = "${mandir}/man5/passwd.5" |
184 | ALTERNATIVE_LINK_NAME[getspnam.3] = "${mandir}/man3/getspnam.3" | 184 | ALTERNATIVE_LINK_NAME[getspnam.3] = "${mandir}/man3/getspnam.3" |
185 | ALTERNATIVE_LINK_NAME[groups.1] = "${mandir}/man1/groups.1" | 185 | ALTERNATIVE_LINK_NAME[groups.1] = "${mandir}/man1/groups.1" |
186 | ALTERNATIVE_LINK_NAME[su.1] = "${mandir}/man1/su.1" | ||
186 | 187 | ||
187 | pkg_postinst_${PN} () { | 188 | pkg_postinst_${PN} () { |
188 | if [ "x$D" != "x" ]; then | 189 | if [ "x$D" != "x" ]; then |