summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan McGregor <danismostlikely@gmail.com>2024-04-11 16:36:13 -0600
committerRichard Purdie <richard.purdie@linuxfoundation.org>2024-04-22 22:05:57 +0100
commit8df079038aa9e378fada8322d0410b58c3950d40 (patch)
treebbd3c5270aeb259ea868d3bf6aad7dca48c2d419
parent3615085315fbe94ece5c4be60ccb53a1cb077ae8 (diff)
downloadpoky-8df079038aa9e378fada8322d0410b58c3950d40.tar.gz
shadow: install manpages
Install the manpages for shadow, and also make the conflicting manpages alternatives in util-linux. (From OE-Core rev: 647a302e1bf5f9a796b7abf81180b27e26d1959e) Signed-off-by: Daniel McGregor <daniel.mcgregor@vecima.com> Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-core/util-linux/util-linux_2.39.3.bb3
-rw-r--r--meta/recipes-extended/shadow/shadow.inc12
2 files changed, 15 insertions, 0 deletions
diff --git a/meta/recipes-core/util-linux/util-linux_2.39.3.bb b/meta/recipes-core/util-linux/util-linux_2.39.3.bb
index 83b3f4e05b..a3f9badbd9 100644
--- a/meta/recipes-core/util-linux/util-linux_2.39.3.bb
+++ b/meta/recipes-core/util-linux/util-linux_2.39.3.bb
@@ -282,8 +282,11 @@ blkid.8 eject.1 findfs.8 fsck.8 kill.1 last.1 lastb.1 libblkid.3 logger.1 mesg.1
282mountpoint.1 nologin.8 rfkill.8 sulogin.8 utmpdump.1 uuid.3 wall.1\ 282mountpoint.1 nologin.8 rfkill.8 sulogin.8 utmpdump.1 uuid.3 wall.1\
283" 283"
284ALTERNATIVE:${PN}-doc += "${@bb.utils.contains('PACKAGECONFIG', 'pam', 'su.1', '', d)}" 284ALTERNATIVE:${PN}-doc += "${@bb.utils.contains('PACKAGECONFIG', 'pam', 'su.1', '', d)}"
285ALTERNATIVE:${PN}-doc += "${@bb.utils.contains('PACKAGECONFIG', 'chfn-chsh', 'chfn.1 chsh.1', '', d)}"
285 286
286ALTERNATIVE_LINK_NAME[blkid.8] = "${mandir}/man8/blkid.8" 287ALTERNATIVE_LINK_NAME[blkid.8] = "${mandir}/man8/blkid.8"
288ALTERNATIVE_LINK_NAME[chfn.1] = "${mandir}/man1/chfn.1"
289ALTERNATIVE_LINK_NAME[chsh.1] = "${mandir}/man1/chsh.1"
287ALTERNATIVE_LINK_NAME[eject.1] = "${mandir}/man1/eject.1" 290ALTERNATIVE_LINK_NAME[eject.1] = "${mandir}/man1/eject.1"
288ALTERNATIVE_LINK_NAME[findfs.8] = "${mandir}/man8/findfs.8" 291ALTERNATIVE_LINK_NAME[findfs.8] = "${mandir}/man8/findfs.8"
289ALTERNATIVE_LINK_NAME[fsck.8] = "${mandir}/man8/fsck.8" 292ALTERNATIVE_LINK_NAME[fsck.8] = "${mandir}/man8/fsck.8"
diff --git a/meta/recipes-extended/shadow/shadow.inc b/meta/recipes-extended/shadow/shadow.inc
index 7b9763d6db..c15715fc77 100644
--- a/meta/recipes-extended/shadow/shadow.inc
+++ b/meta/recipes-extended/shadow/shadow.inc
@@ -168,6 +168,14 @@ do_install:append:class-native() {
168SYSROOT_DIRS:append:class-native = " ${STAGING_DIR_NATIVE}/lib-shadow-deps/" 168SYSROOT_DIRS:append:class-native = " ${STAGING_DIR_NATIVE}/lib-shadow-deps/"
169INSANE_SKIP:${PN}:class-native = "already-stripped" 169INSANE_SKIP:${PN}:class-native = "already-stripped"
170 170
171do_install:append:class-nativesdk() {
172 oe_runmake -C ${B}/man DESTDIR="${D}" sbindir="${base_sbindir}" usbindir="${sbindir}" install-man
173}
174
175do_install:append:class-target() {
176 oe_runmake -C ${B}/man DESTDIR="${D}" sbindir="${base_sbindir}" usbindir="${sbindir}" install-man
177}
178
171PACKAGES =+ "${PN}-base" 179PACKAGES =+ "${PN}-base"
172FILES:${PN}-base = "\ 180FILES:${PN}-base = "\
173 ${base_bindir}/login.shadow \ 181 ${base_bindir}/login.shadow \
@@ -193,6 +201,10 @@ ALTERNATIVE_LINK_NAME[vipw] = "${base_sbindir}/vipw"
193ALTERNATIVE_LINK_NAME[vigr] = "${base_sbindir}/vigr" 201ALTERNATIVE_LINK_NAME[vigr] = "${base_sbindir}/vigr"
194ALTERNATIVE_LINK_NAME[nologin] = "${base_sbindir}/nologin" 202ALTERNATIVE_LINK_NAME[nologin] = "${base_sbindir}/nologin"
195 203
204ALTERNATIVE:${PN}-doc = "chfn.1 chsh.1"
205ALTERNATIVE_LINK_NAME[chfn.1] = "${mandir}/man1/chfn.1"
206ALTERNATIVE_LINK_NAME[chsh.1] = "${mandir}/man1/chsh.1"
207
196ALTERNATIVE:${PN}-base = "newgrp groups login su" 208ALTERNATIVE:${PN}-base = "newgrp groups login su"
197ALTERNATIVE_LINK_NAME[login] = "${base_bindir}/login" 209ALTERNATIVE_LINK_NAME[login] = "${base_bindir}/login"
198ALTERNATIVE_LINK_NAME[su] = "${base_bindir}/su" 210ALTERNATIVE_LINK_NAME[su] = "${base_bindir}/su"