summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorIoan-Adrian Ratiu <adrian.ratiu@ni.com>2018-07-05 11:57:19 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-07-06 22:55:01 +0100
commit78a2bdae65713fcbe719fb3810416ba88d4ccc28 (patch)
tree17878dbca7ce1a9af3b893fcd4137dd8c6b28ab7 /meta
parent9b7e107140dcf5523ec393fcc8a82fd29e7a3654 (diff)
downloadpoky-78a2bdae65713fcbe719fb3810416ba88d4ccc28.tar.gz
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. (From OE-Core rev: 147da8fe7458a38598845958cb358bb094eba57b) Signed-off-by: Ioan-Adrian Ratiu <adrian.ratiu@ni.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-core/util-linux/util-linux.inc4
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 () {
206ALTERNATIVE_PRIORITY = "80" 206ALTERNATIVE_PRIORITY = "80"
207 207
208ALTERNATIVE_${PN} = "dmesg kill more mkswap blockdev pivot_root switch_root" 208ALTERNATIVE_${PN} = "dmesg kill more mkswap blockdev pivot_root switch_root"
209ALTERNATIVE_${PN} += "hexdump last lastb logger mesg renice wall" 209ALTERNATIVE_${PN} += "hexdump last lastb logger mesg renice wall fallocate unshare"
210ALTERNATIVE_${PN} += "setsid chrt flock utmpdump eject nologin taskset" 210ALTERNATIVE_${PN} += "setsid chrt flock utmpdump eject nologin taskset"
211 211
212ALTERNATIVE_LINK_NAME[dmesg] = "${base_bindir}/dmesg" 212ALTERNATIVE_LINK_NAME[dmesg] = "${base_bindir}/dmesg"
@@ -217,6 +217,8 @@ ALTERNATIVE_LINK_NAME[blockdev] = "${base_sbindir}/blockdev"
217ALTERNATIVE_LINK_NAME[pivot_root] = "${base_sbindir}/pivot_root" 217ALTERNATIVE_LINK_NAME[pivot_root] = "${base_sbindir}/pivot_root"
218ALTERNATIVE_LINK_NAME[switch_root] = "${base_sbindir}/switch_root" 218ALTERNATIVE_LINK_NAME[switch_root] = "${base_sbindir}/switch_root"
219ALTERNATIVE_LINK_NAME[eject] = "${bindir}/eject" 219ALTERNATIVE_LINK_NAME[eject] = "${bindir}/eject"
220ALTERNATIVE_LINK_NAME[unshare] = "${bindir}/unshare"
221ALTERNATIVE_LINK_NAME[fallocate] = "${bindir}/fallocate"
220ALTERNATIVE_LINK_NAME[nologin] = "${base_sbindir}/nologin" 222ALTERNATIVE_LINK_NAME[nologin] = "${base_sbindir}/nologin"
221 223
222ALTERNATIVE_${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" 224ALTERNATIVE_${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"