diff options
| author | Ioan-Adrian Ratiu <adrian.ratiu@ni.com> | 2018-07-05 11:57:19 +0300 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-07-06 22:54:56 +0100 |
| commit | 147da8fe7458a38598845958cb358bb094eba57b (patch) | |
| tree | 518dc0fed5ee6350e06bd4312178b208adc5eb84 | |
| parent | 0ab4fc861cff69acc42446c22f7a7ed2e6128849 (diff) | |
| download | openembedded-core-147da8fe7458a38598845958cb358bb094eba57b.tar.gz openembedded-core-147da8fe7458a38598845958cb358bb094eba57b.tar.bz2 openembedded-core-147da8fe7458a38598845958cb358bb094eba57b.zip | |
util-linux.inc: add fallocate & unshare to alternatives
These binaries can be provided by busybox triggering a conflict in
do_rootfs so update-alternatives needs to know about them to properly
create the symlinks.
Signed-off-by: Ioan-Adrian Ratiu <adrian.ratiu@ni.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
| -rw-r--r-- | meta/recipes-core/util-linux/util-linux.inc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/meta/recipes-core/util-linux/util-linux.inc b/meta/recipes-core/util-linux/util-linux.inc index 8d8f3962ff..ed5c618750 100644 --- a/meta/recipes-core/util-linux/util-linux.inc +++ b/meta/recipes-core/util-linux/util-linux.inc @@ -206,7 +206,7 @@ do_install_append_class-native () { ALTERNATIVE_PRIORITY = "80" ALTERNATIVE_${PN} = "dmesg kill more mkswap blockdev pivot_root switch_root" -ALTERNATIVE_${PN} += "hexdump last lastb logger mesg renice wall" +ALTERNATIVE_${PN} += "hexdump last lastb logger mesg renice wall fallocate unshare" ALTERNATIVE_${PN} += "setsid chrt flock utmpdump eject nologin taskset" ALTERNATIVE_LINK_NAME[dmesg] = "${base_bindir}/dmesg" @@ -217,6 +217,8 @@ ALTERNATIVE_LINK_NAME[blockdev] = "${base_sbindir}/blockdev" ALTERNATIVE_LINK_NAME[pivot_root] = "${base_sbindir}/pivot_root" ALTERNATIVE_LINK_NAME[switch_root] = "${base_sbindir}/switch_root" ALTERNATIVE_LINK_NAME[eject] = "${bindir}/eject" +ALTERNATIVE_LINK_NAME[unshare] = "${bindir}/unshare" +ALTERNATIVE_LINK_NAME[fallocate] = "${bindir}/fallocate" ALTERNATIVE_LINK_NAME[nologin] = "${base_sbindir}/nologin" ALTERNATIVE_${PN}-doc = "mountpoint.1 last.1 lastb.1 mesg.1 wall.1 nologin.8 sulogin.8 utmpdump.1 rfkill.8 kill.1 libblkid.3 blkid.8 findfs.8 fsck.8 uuid.3 eject.1 logger.1" |