diff options
| author | Chen Qi <Qi.Chen@windriver.com> | 2024-10-24 23:44:37 -0700 |
|---|---|---|
| committer | Steve Sakoman <steve@sakoman.com> | 2024-11-30 05:41:59 -0800 |
| commit | 5337502bb31288ed0c800821b85db36109ea5d9f (patch) | |
| tree | 8e79867047a86f04d7319393c599c4ea81ea131a /meta/recipes-extended | |
| parent | 7c76a24afb06e47fc2f14ee7a7f16bec14b077e2 (diff) | |
| download | poky-5337502bb31288ed0c800821b85db36109ea5d9f.tar.gz | |
shadow: use update-alternatives to handle groups.1
This patch fixes the following error at do_rootfs:
update-alternatives: Error: not linking /PATH/TO/rootfs/usr/share
/man/man1/groups.1 to /usr/share/man/man1/groups.1.coreutils since
/PATH/TO/rootfs/usr/share/man/man1/groups.1 exists and is not a link
The problem can be reproduced by adding the following lines to local.conf
and then building an image:
EXTRA_IMAGE_FEATURES:append = " doc-pkgs"
IMAGE_INSTALL:append = " shadow coreutils"
groups.1 is handled by update-alternatives in coreutils recipe, so
do it in shadow recipe too.
(From OE-Core rev: 822d70b7ccc2e5922de99a7703ec7eb3f814e29f)
Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit 78c8eb60097df2e16c699464c39ff9142fc1ae69)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
Diffstat (limited to 'meta/recipes-extended')
| -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 b5e77b9874..171d6e27c3 100644 --- a/meta/recipes-extended/shadow/shadow.inc +++ b/meta/recipes-extended/shadow/shadow.inc | |||
| @@ -200,9 +200,10 @@ ALTERNATIVE_LINK_NAME[vipw] = "${base_sbindir}/vipw" | |||
| 200 | ALTERNATIVE_LINK_NAME[vigr] = "${base_sbindir}/vigr" | 200 | ALTERNATIVE_LINK_NAME[vigr] = "${base_sbindir}/vigr" |
| 201 | ALTERNATIVE_LINK_NAME[nologin] = "${base_sbindir}/nologin" | 201 | ALTERNATIVE_LINK_NAME[nologin] = "${base_sbindir}/nologin" |
| 202 | 202 | ||
| 203 | ALTERNATIVE:${PN}-doc = "chfn.1 chsh.1" | 203 | ALTERNATIVE:${PN}-doc = "chfn.1 chsh.1 groups.1" |
| 204 | ALTERNATIVE_LINK_NAME[chfn.1] = "${mandir}/man1/chfn.1" | 204 | ALTERNATIVE_LINK_NAME[chfn.1] = "${mandir}/man1/chfn.1" |
| 205 | ALTERNATIVE_LINK_NAME[chsh.1] = "${mandir}/man1/chsh.1" | 205 | ALTERNATIVE_LINK_NAME[chsh.1] = "${mandir}/man1/chsh.1" |
| 206 | ALTERNATIVE_LINK_NAME[groups.1] = "${mandir}/man1/groups.1" | ||
| 206 | 207 | ||
| 207 | ALTERNATIVE:${PN}-base = "newgrp groups login su" | 208 | ALTERNATIVE:${PN}-base = "newgrp groups login su" |
| 208 | ALTERNATIVE_LINK_NAME[login] = "${base_bindir}/login" | 209 | ALTERNATIVE_LINK_NAME[login] = "${base_bindir}/login" |
