summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2022-04-26 15:45:36 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2022-05-04 13:07:34 +0100
commitdfe1dd65e3142293735043659fab96b1a768bdc9 (patch)
treeac5119d368f0d2b90fbfae128c3b4d5f45118836
parent646a5903100089c242e8ad759f2ca98a615a9b14 (diff)
downloadpoky-dfe1dd65e3142293735043659fab96b1a768bdc9.tar.gz
util-linux: Create u-a symlink for findfs utility
busybox also installs findfs but into base_sbindir which works out to be ok when sbindir != base_sbindir but with usrmerge distro feature enabled this starts to cause trouble because busybox's postinst is trying to create a symlink for findfs applet in base_sbindir which is same as sbindir now and there already is binary from util-linux and image fails to build 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} (). The real reason is burried in do_rootfs logs update-alternatives: Error: not linking /mnt/b/yoe/master/build/tmp/work/beaglebone-yoe-linux-gnueabi/yoe-sdk-image/1.0-r0/rootfs/usr/sbin/findfs to /usr/bin/busybox.suid since /mnt/b/yoe/master/build/tmp/work/beaglebone-yoe-linux-gnueabi/yoe-sdk-image/1.0-r0/rootfs/usr/sbin/findfs exists and is not a link Creating proper u-a for findfs in util-linux fixes the issue (From OE-Core rev: 04e03fa3acde7a23825fb9a17de98f1cecaae097) Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Luca Ceresoli <luca.ceresoli@bootlin.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> (cherry picked from commit 211ae2db1ab8fec1ed678170f9d8cbca2cc27ef3) Signed-off-by: Steve Sakoman <steve@sakoman.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-core/util-linux/util-linux_2.37.4.bb1
1 files changed, 1 insertions, 0 deletions
diff --git a/meta/recipes-core/util-linux/util-linux_2.37.4.bb b/meta/recipes-core/util-linux/util-linux_2.37.4.bb
index d609c30067..b39020884f 100644
--- a/meta/recipes-core/util-linux/util-linux_2.37.4.bb
+++ b/meta/recipes-core/util-linux/util-linux_2.37.4.bb
@@ -221,6 +221,7 @@ ALTERNATIVE_LINK_NAME[dmesg] = "${base_bindir}/dmesg"
221ALTERNATIVE_LINK_NAME[eject] = "${bindir}/eject" 221ALTERNATIVE_LINK_NAME[eject] = "${bindir}/eject"
222ALTERNATIVE_LINK_NAME[fallocate] = "${bindir}/fallocate" 222ALTERNATIVE_LINK_NAME[fallocate] = "${bindir}/fallocate"
223ALTERNATIVE_LINK_NAME[fdisk] = "${base_sbindir}/fdisk" 223ALTERNATIVE_LINK_NAME[fdisk] = "${base_sbindir}/fdisk"
224ALTERNATIVE_LINK_NAME[findfs] = "${sbindir}/findfs"
224ALTERNATIVE_LINK_NAME[flock] = "${bindir}/flock" 225ALTERNATIVE_LINK_NAME[flock] = "${bindir}/flock"
225ALTERNATIVE_LINK_NAME[fsck] = "${base_sbindir}/fsck" 226ALTERNATIVE_LINK_NAME[fsck] = "${base_sbindir}/fsck"
226ALTERNATIVE_LINK_NAME[fsfreeze] = "${sbindir}/fsfreeze" 227ALTERNATIVE_LINK_NAME[fsfreeze] = "${sbindir}/fsfreeze"