aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMax Krummenacher <max.oss.09@gmail.com>2018-10-05 12:05:18 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-10-09 12:02:41 +0100
commit94e3fdff76452d3acde42b164d3ffa6b72540a40 (patch)
treeafdaef0180c09ddd872672904f95bd62d5230643
parent99b74d1ff23ef91c84dc81ecf6437ad3bc37fb64 (diff)
downloadopenembedded-core-contrib-94e3fdff76452d3acde42b164d3ffa6b72540a40.tar.gz
openembedded-core-contrib-94e3fdff76452d3acde42b164d3ffa6b72540a40.tar.bz2
openembedded-core-contrib-94e3fdff76452d3acde42b164d3ffa6b72540a40.zip
util-linux: Use update-alternatives for fsfreeze, nsenter
busybox may also provide a fsfreeze and nsenter implementation, so use u-a to allow installing them side by side. If one installs both, busybox and util-linux, one gets the following error (seen on a populate-sdk run): | ERROR: 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} (). | Deferring to first boot via 'exit 1' is no longer supported. And the coresponding do_populate_sdk extract: | ... | update-alternatives: Error: not linking ...sdk/image/usr/local/oecore-x86_64/sysroots/armv7at2hf-neon-angstrom-linux-gnueabi/usr/sbin/fsfreeze | to /bin/busybox.nosuid /bin/busybox.nosuid since ...sdk/image/usr/local/oecore-x86_64/sysroots/armv7at2hf-neon-angstrom-linux-gnueabi/usr/sbin/fsfreeze | exists and is not a link | ... Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-core/util-linux/util-linux.inc10
1 files changed, 7 insertions, 3 deletions
diff --git a/meta/recipes-core/util-linux/util-linux.inc b/meta/recipes-core/util-linux/util-linux.inc
index c2e02e847a8..45e2203a644 100644
--- a/meta/recipes-core/util-linux/util-linux.inc
+++ b/meta/recipes-core/util-linux/util-linux.inc
@@ -205,9 +205,12 @@ 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 unshare"
-ALTERNATIVE_${PN} += "setsid chrt flock utmpdump eject nologin taskset fallocate"
+ALTERNATIVE_${PN} = " \
+ dmesg kill more mkswap blockdev pivot_root switch_root \
+ hexdump last lastb logger mesg renice wall unshare \
+ setsid chrt flock utmpdump eject nologin taskset fallocate \
+ fsfreeze nsenter \
+"
ALTERNATIVE_LINK_NAME[dmesg] = "${base_bindir}/dmesg"
ALTERNATIVE_LINK_NAME[kill] = "${base_bindir}/kill"
@@ -219,6 +222,7 @@ 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[fsfreeze] = "${sbindir}/fsfreeze"
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"