From fc66762d7c112fb798c2444dd902ce03baf975c4 Mon Sep 17 00:00:00 2001 From: Patrick Williams Date: Thu, 15 Sep 2016 16:11:16 -0500 Subject: util-linux: Disable minix support. Disable building of {mkfs,fsck}.minix, which are used to support minix file-systems. Minix predates Linux and support for its file-systems is unlikely to be needed. No recipes otherwise reference minix, except in patches to autotools configuration scripts, so there should be no impact to other recipes. Signed-off-by: Patrick Williams Signed-off-by: Richard Purdie --- meta/recipes-core/util-linux/util-linux.inc | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/meta/recipes-core/util-linux/util-linux.inc b/meta/recipes-core/util-linux/util-linux.inc index bf770d8dd7..608f1987c9 100644 --- a/meta/recipes-core/util-linux/util-linux.inc +++ b/meta/recipes-core/util-linux/util-linux.inc @@ -45,7 +45,8 @@ SHARED_EXTRA_OECONF = "--disable-use-tty-group \ --enable-raw --enable-reset --disable-login \ --disable-vipw --disable-newgrp --disable-chfn-chsh \ --enable-write --enable-mount \ - --enable-libuuid --enable-libblkid --enable-fsck --without-udev \ + --enable-libuuid --enable-libblkid --enable-fsck \ + --disable-minix --without-udev \ usrsbin_execdir='${sbindir}' \ " @@ -191,7 +192,7 @@ do_install_append_class-native () { ALTERNATIVE_PRIORITY = "80" ALTERNATIVE_${PN} = "dmesg kill more mkswap blockdev pivot_root switch_root" -ALTERNATIVE_${PN} += "mkfs.minix hexdump last lastb logger mesg renice wall" +ALTERNATIVE_${PN} += "hexdump last lastb logger mesg renice wall" ALTERNATIVE_${PN} += "setsid chrt flock utmpdump eject" ALTERNATIVE_LINK_NAME[dmesg] = "${base_bindir}/dmesg" @@ -201,7 +202,6 @@ ALTERNATIVE_LINK_NAME[mkswap] = "${base_sbindir}/mkswap" 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[mkfs.minix] = "${base_sbindir}/mkfs.minix" ALTERNATIVE_LINK_NAME[eject] = "${bindir}/eject" ALTERNATIVE_${PN}-doc = "mountpoint.1 last.1 lastb.1 mesg.1 wall.1 nologin.8 sulogin.8 utmpdump.1 reset.1 kill.1 libblkid.3 blkid.8 findfs.8 fsck.8 uuid.3" @@ -248,8 +248,7 @@ ALTERNATIVE_util-linux-swaponoff = "swapoff swapon" ALTERNATIVE_LINK_NAME[swapoff] = "${base_sbindir}/swapoff" ALTERNATIVE_LINK_NAME[swapon] = "${base_sbindir}/swapon" -ALTERNATIVE_util-linux-fsck = "fsck.minix fsck" -ALTERNATIVE_LINK_NAME[fsck.minix] = "${base_sbindir}/fsck.minix" +ALTERNATIVE_util-linux-fsck = "fsck" ALTERNATIVE_LINK_NAME[fsck] = "${base_sbindir}/fsck" ALTERNATIVE_util-linux-blkid = "blkid" -- cgit 1.2.3-korg