Message ID | 20240404221823.3671396-1-danismostlikely@gmail.com |
---|---|
State | New |
Headers | show |
Series | shadow: install manpages | expand |
Hello, This causes the following warnings: https://autobuilder.yoctoproject.org/typhoon/#/builders/76/builds/8766/steps/12/logs/warnings https://autobuilder.yoctoproject.org/typhoon/#/builders/59/builds/8739/steps/17/logs/warnings https://autobuilder.yoctoproject.org/typhoon/#/builders/47/builds/8787/steps/11/logs/warnings https://autobuilder.yoctoproject.org/typhoon/#/builders/47/builds/8787/steps/14/logs/warnings https://autobuilder.yoctoproject.org/typhoon/#/builders/44/builds/8849/steps/25/logs/warnings WARNING: nativesdk-shadow-4.14.2-r0 do_package: shadow: alternative target (/usr/local/oe-sdk-hardcoded-buildpath/sysroots/x86_64-pokysdk-linux/usr/share/man/man1/chfn.1 or /usr/local/oe-sdk-hardcoded-buildpath/sysroots/x86_64-pokysdk-linux/usr/share/man/man1/chfn.1.shadow) does not exist, skipping... WARNING: nativesdk-shadow-4.14.2-r0 do_package: shadow: alternative target (/usr/local/oe-sdk-hardcoded-buildpath/sysroots/x86_64-pokysdk-linux/usr/share/man/man1/chsh.1 or /usr/local/oe-sdk-hardcoded-buildpath/sysroots/x86_64-pokysdk-linux/usr/share/man/man1/chsh.1.shadow) does not exist, skipping... WARNING: nativesdk-shadow-4.14.2-r0 do_package: shadow: NOT adding alternative provide /usr/local/oe-sdk-hardcoded-buildpath/sysroots/x86_64-pokysdk-linux/usr/share/man/man1/chfn.1: /usr/local/oe-sdk-hardcoded-buildpath/sysroots/x86_64-pokysdk-linux/usr/share/man/man1/chfn.1.shadow does not exist WARNING: nativesdk-shadow-4.14.2-r0 do_package: shadow: NOT adding alternative provide /usr/local/oe-sdk-hardcoded-buildpath/sysroots/x86_64-pokysdk-linux/usr/share/man/man1/chsh.1: /usr/local/oe-sdk-hardcoded-buildpath/sysroots/x86_64-pokysdk-linux/usr/share/man/man1/chsh.1.shadow does not exist WARNING: nativesdk-shadow-4.14.2-r0 do_package: shadow: alt_link == alt_target: /usr/local/oe-sdk-hardcoded-buildpath/sysroots/x86_64-pokysdk-linux/usr/share/man/man1/chfn.1 == /usr/local/oe-sdk-hardcoded-buildpath/sysroots/x86_64-pokysdk-linux/usr/share/man/man1/chfn.1 WARNING: nativesdk-shadow-4.14.2-r0 do_package: shadow: alt_link == alt_target: /usr/local/oe-sdk-hardcoded-buildpath/sysroots/x86_64-pokysdk-linux/usr/share/man/man1/chsh.1 == /usr/local/oe-sdk-hardcoded-buildpath/sysroots/x86_64-pokysdk-linux/usr/share/man/man1/chsh.1 On 04/04/2024 16:18:23-0600, Dan McGregor wrote: > From: Daniel McGregor <daniel.mcgregor@vecima.com> > > Install the manpages for shadow, and also make the conflicting manpages > alternatives in util-linux. > > Signed-off-by: Daniel McGregor <daniel.mcgregor@vecima.com> > --- > meta/recipes-core/util-linux/util-linux_2.39.3.bb | 3 +++ > meta/recipes-extended/shadow/shadow.inc | 8 ++++++++ > 2 files changed, 11 insertions(+) > > 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 83b3f4e05b3..a3f9badbd97 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 > mountpoint.1 nologin.8 rfkill.8 sulogin.8 utmpdump.1 uuid.3 wall.1\ > " > ALTERNATIVE:${PN}-doc += "${@bb.utils.contains('PACKAGECONFIG', 'pam', 'su.1', '', d)}" > +ALTERNATIVE:${PN}-doc += "${@bb.utils.contains('PACKAGECONFIG', 'chfn-chsh', 'chfn.1 chsh.1', '', d)}" > > ALTERNATIVE_LINK_NAME[blkid.8] = "${mandir}/man8/blkid.8" > +ALTERNATIVE_LINK_NAME[chfn.1] = "${mandir}/man1/chfn.1" > +ALTERNATIVE_LINK_NAME[chsh.1] = "${mandir}/man1/chsh.1" > ALTERNATIVE_LINK_NAME[eject.1] = "${mandir}/man1/eject.1" > ALTERNATIVE_LINK_NAME[findfs.8] = "${mandir}/man8/findfs.8" > ALTERNATIVE_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 40e6ab0b30e..0029d848bf1 100644 > --- a/meta/recipes-extended/shadow/shadow.inc > +++ b/meta/recipes-extended/shadow/shadow.inc > @@ -168,6 +168,10 @@ do_install:append:class-native() { > SYSROOT_DIRS:append:class-native = " ${STAGING_DIR_NATIVE}/lib-shadow-deps/" > INSANE_SKIP:${PN}:class-native = "already-stripped" > > +do_install:append:class-target() { > + oe_runmake -C ${B}/man DESTDIR="${D}" sbindir="${base_sbindir}" usbindir="${sbindir}" install-man > +} > + > PACKAGES =+ "${PN}-base" > FILES:${PN}-base = "\ > ${base_bindir}/login.shadow \ > @@ -193,6 +197,10 @@ ALTERNATIVE_LINK_NAME[vipw] = "${base_sbindir}/vipw" > ALTERNATIVE_LINK_NAME[vigr] = "${base_sbindir}/vigr" > ALTERNATIVE_LINK_NAME[nologin] = "${base_sbindir}/nologin" > > +ALTERNATIVE:${PN}-doc = "chfn.1 chsh.1" > +ALTERNATIVE_LINK_NAME[chfn.1] = "${mandir}/man1/chfn.1" > +ALTERNATIVE_LINK_NAME[chsh.1] = "${mandir}/man1/chsh.1" > + > ALTERNATIVE:${PN}-base = "newgrp groups login su" > ALTERNATIVE_LINK_NAME[login] = "${base_bindir}/login" > ALTERNATIVE_LINK_NAME[su] = "${base_bindir}/su" > -- > 2.41.0 > > > -=-=-=-=-=-=-=-=-=-=-=- > Links: You receive all messages sent to this group. > View/Reply Online (#197974): https://lists.openembedded.org/g/openembedded-core/message/197974 > Mute This Topic: https://lists.openembedded.org/mt/105338723/3617179 > Group Owner: openembedded-core+owner@lists.openembedded.org > Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [alexandre.belloni@bootlin.com] > -=-=-=-=-=-=-=-=-=-=-=- >
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 83b3f4e05b3..a3f9badbd97 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 mountpoint.1 nologin.8 rfkill.8 sulogin.8 utmpdump.1 uuid.3 wall.1\ " ALTERNATIVE:${PN}-doc += "${@bb.utils.contains('PACKAGECONFIG', 'pam', 'su.1', '', d)}" +ALTERNATIVE:${PN}-doc += "${@bb.utils.contains('PACKAGECONFIG', 'chfn-chsh', 'chfn.1 chsh.1', '', d)}" ALTERNATIVE_LINK_NAME[blkid.8] = "${mandir}/man8/blkid.8" +ALTERNATIVE_LINK_NAME[chfn.1] = "${mandir}/man1/chfn.1" +ALTERNATIVE_LINK_NAME[chsh.1] = "${mandir}/man1/chsh.1" ALTERNATIVE_LINK_NAME[eject.1] = "${mandir}/man1/eject.1" ALTERNATIVE_LINK_NAME[findfs.8] = "${mandir}/man8/findfs.8" ALTERNATIVE_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 40e6ab0b30e..0029d848bf1 100644 --- a/meta/recipes-extended/shadow/shadow.inc +++ b/meta/recipes-extended/shadow/shadow.inc @@ -168,6 +168,10 @@ do_install:append:class-native() { SYSROOT_DIRS:append:class-native = " ${STAGING_DIR_NATIVE}/lib-shadow-deps/" INSANE_SKIP:${PN}:class-native = "already-stripped" +do_install:append:class-target() { + oe_runmake -C ${B}/man DESTDIR="${D}" sbindir="${base_sbindir}" usbindir="${sbindir}" install-man +} + PACKAGES =+ "${PN}-base" FILES:${PN}-base = "\ ${base_bindir}/login.shadow \ @@ -193,6 +197,10 @@ ALTERNATIVE_LINK_NAME[vipw] = "${base_sbindir}/vipw" ALTERNATIVE_LINK_NAME[vigr] = "${base_sbindir}/vigr" ALTERNATIVE_LINK_NAME[nologin] = "${base_sbindir}/nologin" +ALTERNATIVE:${PN}-doc = "chfn.1 chsh.1" +ALTERNATIVE_LINK_NAME[chfn.1] = "${mandir}/man1/chfn.1" +ALTERNATIVE_LINK_NAME[chsh.1] = "${mandir}/man1/chsh.1" + ALTERNATIVE:${PN}-base = "newgrp groups login su" ALTERNATIVE_LINK_NAME[login] = "${base_bindir}/login" ALTERNATIVE_LINK_NAME[su] = "${base_bindir}/su"