summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBenjamin Bouvier <benjamin.bouvier@ekinops.com>2023-07-04 15:18:44 +0200
committerSteve Sakoman <steve@sakoman.com>2023-08-01 06:17:28 -1000
commit0a98281d37b0bd8dc1548c390216cb3978e36e0e (patch)
tree8e3eaf053257c1d813141c120ab5fc99dc54e107
parent6135c1ad77f9fcc270fdd4d02b422071df664272 (diff)
downloadpoky-0a98281d37b0bd8dc1548c390216cb3978e36e0e.tar.gz
util-linux: add alternative links for ipcs,ipcrm
When enabling ipcs and ipcrm configuration into busybox, both tools are built and then deployed during do_rootfs. These operation lead to below issue (similar behavior happens for ipcs): do_rootfs: Postinstall scriptlets of ['busybox'] have failed. If the intention is to defer them to first boot, then please place them into pkg_postinst_ontarget:${PN} (). update-alternatives: Error: not linking .../build/tmp/work/board-poky-linux/board-image/1.0-r0/rootfs/usr/bin/ipcrm to /bin/busybox since .../build/tmp/work/board-poky-linux/board-image/1.0-r0/rootfs/usr/bin/ipcrm exists and is not a link Binaries enter in conflict with same named util-linux utilities during do_rootfs step. Adding ALTERNATIVE_LINK_NAME for both tools fix the issue. (From OE-Core rev: dc4099307100de817110958c9426ced4189fd0ac) Signed-off-by: Benjamin Bouvier <benjamin.bouvier@ekinops.com> Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> (cherry picked from commit e4d60408b869c9cc2ccff794d4e271d993ec8a97) Signed-off-by: Steve Sakoman <steve@sakoman.com>
-rw-r--r--meta/recipes-core/util-linux/util-linux_2.38.1.bb2
1 files changed, 2 insertions, 0 deletions
diff --git a/meta/recipes-core/util-linux/util-linux_2.38.1.bb b/meta/recipes-core/util-linux/util-linux_2.38.1.bb
index 9ea7a04e8a..c81405533c 100644
--- a/meta/recipes-core/util-linux/util-linux_2.38.1.bb
+++ b/meta/recipes-core/util-linux/util-linux_2.38.1.bb
@@ -234,6 +234,8 @@ ALTERNATIVE_TARGET[getty] = "${base_sbindir}/agetty"
234ALTERNATIVE_LINK_NAME[hexdump] = "${bindir}/hexdump" 234ALTERNATIVE_LINK_NAME[hexdump] = "${bindir}/hexdump"
235ALTERNATIVE_LINK_NAME[hwclock] = "${base_sbindir}/hwclock" 235ALTERNATIVE_LINK_NAME[hwclock] = "${base_sbindir}/hwclock"
236ALTERNATIVE_LINK_NAME[ionice] = "${bindir}/ionice" 236ALTERNATIVE_LINK_NAME[ionice] = "${bindir}/ionice"
237ALTERNATIVE_LINK_NAME[ipcrm] = "${bindir}/ipcrm"
238ALTERNATIVE_LINK_NAME[ipcs] = "${bindir}/ipcs"
237ALTERNATIVE_LINK_NAME[kill] = "${base_bindir}/kill" 239ALTERNATIVE_LINK_NAME[kill] = "${base_bindir}/kill"
238ALTERNATIVE:${PN}-last = "last lastb" 240ALTERNATIVE:${PN}-last = "last lastb"
239ALTERNATIVE_LINK_NAME[last] = "${bindir}/last" 241ALTERNATIVE_LINK_NAME[last] = "${bindir}/last"