summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorPatrick Williams <patrick@stwcx.xyz>2016-09-15 16:11:16 -0500
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-09-16 15:24:03 +0100
commite88cee8cc31d096ccc7ae0213919a9c53a710482 (patch)
tree1ac542ef5b179ad177c460933b2bf95ce5da1d49 /meta
parent8d3f71234f8e14b5aa1e5ced4676d5b3d7ac014f (diff)
downloadpoky-e88cee8cc31d096ccc7ae0213919a9c53a710482.tar.gz
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. (From OE-Core rev: fc66762d7c112fb798c2444dd902ce03baf975c4) Signed-off-by: Patrick Williams <patrick@stwcx.xyz> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-core/util-linux/util-linux.inc9
1 files 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 \
45 --enable-raw --enable-reset --disable-login \ 45 --enable-raw --enable-reset --disable-login \
46 --disable-vipw --disable-newgrp --disable-chfn-chsh \ 46 --disable-vipw --disable-newgrp --disable-chfn-chsh \
47 --enable-write --enable-mount \ 47 --enable-write --enable-mount \
48 --enable-libuuid --enable-libblkid --enable-fsck --without-udev \ 48 --enable-libuuid --enable-libblkid --enable-fsck \
49 --disable-minix --without-udev \
49 usrsbin_execdir='${sbindir}' \ 50 usrsbin_execdir='${sbindir}' \
50" 51"
51 52
@@ -191,7 +192,7 @@ do_install_append_class-native () {
191ALTERNATIVE_PRIORITY = "80" 192ALTERNATIVE_PRIORITY = "80"
192 193
193ALTERNATIVE_${PN} = "dmesg kill more mkswap blockdev pivot_root switch_root" 194ALTERNATIVE_${PN} = "dmesg kill more mkswap blockdev pivot_root switch_root"
194ALTERNATIVE_${PN} += "mkfs.minix hexdump last lastb logger mesg renice wall" 195ALTERNATIVE_${PN} += "hexdump last lastb logger mesg renice wall"
195ALTERNATIVE_${PN} += "setsid chrt flock utmpdump eject" 196ALTERNATIVE_${PN} += "setsid chrt flock utmpdump eject"
196 197
197ALTERNATIVE_LINK_NAME[dmesg] = "${base_bindir}/dmesg" 198ALTERNATIVE_LINK_NAME[dmesg] = "${base_bindir}/dmesg"
@@ -201,7 +202,6 @@ ALTERNATIVE_LINK_NAME[mkswap] = "${base_sbindir}/mkswap"
201ALTERNATIVE_LINK_NAME[blockdev] = "${base_sbindir}/blockdev" 202ALTERNATIVE_LINK_NAME[blockdev] = "${base_sbindir}/blockdev"
202ALTERNATIVE_LINK_NAME[pivot_root] = "${base_sbindir}/pivot_root" 203ALTERNATIVE_LINK_NAME[pivot_root] = "${base_sbindir}/pivot_root"
203ALTERNATIVE_LINK_NAME[switch_root] = "${base_sbindir}/switch_root" 204ALTERNATIVE_LINK_NAME[switch_root] = "${base_sbindir}/switch_root"
204ALTERNATIVE_LINK_NAME[mkfs.minix] = "${base_sbindir}/mkfs.minix"
205ALTERNATIVE_LINK_NAME[eject] = "${bindir}/eject" 205ALTERNATIVE_LINK_NAME[eject] = "${bindir}/eject"
206 206
207ALTERNATIVE_${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" 207ALTERNATIVE_${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"
248ALTERNATIVE_LINK_NAME[swapoff] = "${base_sbindir}/swapoff" 248ALTERNATIVE_LINK_NAME[swapoff] = "${base_sbindir}/swapoff"
249ALTERNATIVE_LINK_NAME[swapon] = "${base_sbindir}/swapon" 249ALTERNATIVE_LINK_NAME[swapon] = "${base_sbindir}/swapon"
250 250
251ALTERNATIVE_util-linux-fsck = "fsck.minix fsck" 251ALTERNATIVE_util-linux-fsck = "fsck"
252ALTERNATIVE_LINK_NAME[fsck.minix] = "${base_sbindir}/fsck.minix"
253ALTERNATIVE_LINK_NAME[fsck] = "${base_sbindir}/fsck" 252ALTERNATIVE_LINK_NAME[fsck] = "${base_sbindir}/fsck"
254 253
255ALTERNATIVE_util-linux-blkid = "blkid" 254ALTERNATIVE_util-linux-blkid = "blkid"