From b7289510855fbf908ff60cff2ee642867c44dbea Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Tue, 7 Nov 2023 09:14:21 +0000 Subject: debianutils: Fix warnings In the recent upgrade, which started to be installed as which.debianutils and the man page was also renamed. Update the recipe to remove the now unneeded man page alternatives and rename the binary to match what the code expects. This avoids warnings like: WARNING: debianutils-5.14-r0 do_package: debianutils: alternative target (/usr/share/man/man1/which.1 or /usr/share/man/man1/which.1.debianutils) does not exist, skipping... WARNING: debianutils-5.14-r0 do_package: debianutils: NOT adding alternative provide /usr/share/man/man1/which.1: /usr/share/man/man1/which.1.debianutils does not exist WARNING: debianutils-5.14-r0 do_package: debianutils: alt_link == alt_target: /usr/share/man/man1/which.1 == /usr/share/man/man1/which.1 (From OE-Core rev: 9f8d3438530abceabdfd03d2ff2157bb79e4e034) Signed-off-by: Richard Purdie --- meta/recipes-support/debianutils/debianutils_5.14.bb | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'meta/recipes-support/debianutils') diff --git a/meta/recipes-support/debianutils/debianutils_5.14.bb b/meta/recipes-support/debianutils/debianutils_5.14.bb index f6ca8a6fdd..deec8d1fe8 100644 --- a/meta/recipes-support/debianutils/debianutils_5.14.bb +++ b/meta/recipes-support/debianutils/debianutils_5.14.bb @@ -31,6 +31,7 @@ do_install:append() { mv ${D}${bindir}/$app ${D}${base_bindir}/$app done fi + mv ${D}${bindir}/which.debianutils ${D}${bindir}/which } # Note that we package the update-alternatives name. @@ -47,9 +48,6 @@ ALTERNATIVE:${PN} = "add-shell installkernel remove-shell savelog which" ALTERNATIVE_PRIORITY_${PN}-run-parts = "60" ALTERNATIVE:${PN}-run-parts = "run-parts" -ALTERNATIVE:${PN}-doc = "which.1" -ALTERNATIVE_LINK_NAME[which.1] = "${mandir}/man1/which.1" - ALTERNATIVE_LINK_NAME[add-shell] = "${sbindir}/add-shell" ALTERNATIVE_LINK_NAME[installkernel] = "${sbindir}/installkernel" ALTERNATIVE_LINK_NAME[remove-shell] = "${sbindir}/remove-shell" -- cgit v1.2.3-54-g00ecf