diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2023-11-07 09:14:21 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2023-11-08 10:56:35 +0000 |
commit | b7289510855fbf908ff60cff2ee642867c44dbea (patch) | |
tree | 553ce9ab5bfdba8ac61200ec0a3a552b2a338006 | |
parent | b177f377285746364354ab26d95b9f2f09f08dcf (diff) | |
download | poky-b7289510855fbf908ff60cff2ee642867c44dbea.tar.gz |
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 <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/recipes-support/debianutils/debianutils_5.14.bb | 4 |
1 files changed, 1 insertions, 3 deletions
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() { | |||
31 | mv ${D}${bindir}/$app ${D}${base_bindir}/$app | 31 | mv ${D}${bindir}/$app ${D}${base_bindir}/$app |
32 | done | 32 | done |
33 | fi | 33 | fi |
34 | mv ${D}${bindir}/which.debianutils ${D}${bindir}/which | ||
34 | } | 35 | } |
35 | 36 | ||
36 | # Note that we package the update-alternatives name. | 37 | # Note that we package the update-alternatives name. |
@@ -47,9 +48,6 @@ ALTERNATIVE:${PN} = "add-shell installkernel remove-shell savelog which" | |||
47 | ALTERNATIVE_PRIORITY_${PN}-run-parts = "60" | 48 | ALTERNATIVE_PRIORITY_${PN}-run-parts = "60" |
48 | ALTERNATIVE:${PN}-run-parts = "run-parts" | 49 | ALTERNATIVE:${PN}-run-parts = "run-parts" |
49 | 50 | ||
50 | ALTERNATIVE:${PN}-doc = "which.1" | ||
51 | ALTERNATIVE_LINK_NAME[which.1] = "${mandir}/man1/which.1" | ||
52 | |||
53 | ALTERNATIVE_LINK_NAME[add-shell] = "${sbindir}/add-shell" | 51 | ALTERNATIVE_LINK_NAME[add-shell] = "${sbindir}/add-shell" |
54 | ALTERNATIVE_LINK_NAME[installkernel] = "${sbindir}/installkernel" | 52 | ALTERNATIVE_LINK_NAME[installkernel] = "${sbindir}/installkernel" |
55 | ALTERNATIVE_LINK_NAME[remove-shell] = "${sbindir}/remove-shell" | 53 | ALTERNATIVE_LINK_NAME[remove-shell] = "${sbindir}/remove-shell" |