summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChen Qi <Qi.Chen@windriver.com>2024-10-24 23:44:37 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2024-10-29 11:19:57 +0000
commite0391665c7c3622d805c98ae48bf289e92c4163e (patch)
treeb732ffbeb02aa93140d43139a011025adeebe974
parent65678573328a33076fe8937d3a6f11bccad5d9b5 (diff)
downloadpoky-e0391665c7c3622d805c98ae48bf289e92c4163e.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: 78c8eb60097df2e16c699464c39ff9142fc1ae69) Signed-off-by: Chen Qi <Qi.Chen@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-extended/shadow/shadow.inc3
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"
200ALTERNATIVE_LINK_NAME[vigr] = "${base_sbindir}/vigr" 200ALTERNATIVE_LINK_NAME[vigr] = "${base_sbindir}/vigr"
201ALTERNATIVE_LINK_NAME[nologin] = "${base_sbindir}/nologin" 201ALTERNATIVE_LINK_NAME[nologin] = "${base_sbindir}/nologin"
202 202
203ALTERNATIVE:${PN}-doc = "chfn.1 chsh.1" 203ALTERNATIVE:${PN}-doc = "chfn.1 chsh.1 groups.1"
204ALTERNATIVE_LINK_NAME[chfn.1] = "${mandir}/man1/chfn.1" 204ALTERNATIVE_LINK_NAME[chfn.1] = "${mandir}/man1/chfn.1"
205ALTERNATIVE_LINK_NAME[chsh.1] = "${mandir}/man1/chsh.1" 205ALTERNATIVE_LINK_NAME[chsh.1] = "${mandir}/man1/chsh.1"
206ALTERNATIVE_LINK_NAME[groups.1] = "${mandir}/man1/groups.1"
206 207
207ALTERNATIVE:${PN}-base = "newgrp groups login su" 208ALTERNATIVE:${PN}-base = "newgrp groups login su"
208ALTERNATIVE_LINK_NAME[login] = "${base_bindir}/login" 209ALTERNATIVE_LINK_NAME[login] = "${base_bindir}/login"