diff options
Diffstat (limited to 'meta/recipes-core/util-linux')
-rw-r--r-- | meta/recipes-core/util-linux/util-linux.inc | 9 |
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 () { | |||
191 | ALTERNATIVE_PRIORITY = "80" | 192 | ALTERNATIVE_PRIORITY = "80" |
192 | 193 | ||
193 | ALTERNATIVE_${PN} = "dmesg kill more mkswap blockdev pivot_root switch_root" | 194 | ALTERNATIVE_${PN} = "dmesg kill more mkswap blockdev pivot_root switch_root" |
194 | ALTERNATIVE_${PN} += "mkfs.minix hexdump last lastb logger mesg renice wall" | 195 | ALTERNATIVE_${PN} += "hexdump last lastb logger mesg renice wall" |
195 | ALTERNATIVE_${PN} += "setsid chrt flock utmpdump eject" | 196 | ALTERNATIVE_${PN} += "setsid chrt flock utmpdump eject" |
196 | 197 | ||
197 | ALTERNATIVE_LINK_NAME[dmesg] = "${base_bindir}/dmesg" | 198 | ALTERNATIVE_LINK_NAME[dmesg] = "${base_bindir}/dmesg" |
@@ -201,7 +202,6 @@ ALTERNATIVE_LINK_NAME[mkswap] = "${base_sbindir}/mkswap" | |||
201 | ALTERNATIVE_LINK_NAME[blockdev] = "${base_sbindir}/blockdev" | 202 | ALTERNATIVE_LINK_NAME[blockdev] = "${base_sbindir}/blockdev" |
202 | ALTERNATIVE_LINK_NAME[pivot_root] = "${base_sbindir}/pivot_root" | 203 | ALTERNATIVE_LINK_NAME[pivot_root] = "${base_sbindir}/pivot_root" |
203 | ALTERNATIVE_LINK_NAME[switch_root] = "${base_sbindir}/switch_root" | 204 | ALTERNATIVE_LINK_NAME[switch_root] = "${base_sbindir}/switch_root" |
204 | ALTERNATIVE_LINK_NAME[mkfs.minix] = "${base_sbindir}/mkfs.minix" | ||
205 | ALTERNATIVE_LINK_NAME[eject] = "${bindir}/eject" | 205 | ALTERNATIVE_LINK_NAME[eject] = "${bindir}/eject" |
206 | 206 | ||
207 | 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" | 207 | 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" | |||
248 | ALTERNATIVE_LINK_NAME[swapoff] = "${base_sbindir}/swapoff" | 248 | ALTERNATIVE_LINK_NAME[swapoff] = "${base_sbindir}/swapoff" |
249 | ALTERNATIVE_LINK_NAME[swapon] = "${base_sbindir}/swapon" | 249 | ALTERNATIVE_LINK_NAME[swapon] = "${base_sbindir}/swapon" |
250 | 250 | ||
251 | ALTERNATIVE_util-linux-fsck = "fsck.minix fsck" | 251 | ALTERNATIVE_util-linux-fsck = "fsck" |
252 | ALTERNATIVE_LINK_NAME[fsck.minix] = "${base_sbindir}/fsck.minix" | ||
253 | ALTERNATIVE_LINK_NAME[fsck] = "${base_sbindir}/fsck" | 252 | ALTERNATIVE_LINK_NAME[fsck] = "${base_sbindir}/fsck" |
254 | 253 | ||
255 | ALTERNATIVE_util-linux-blkid = "blkid" | 254 | ALTERNATIVE_util-linux-blkid = "blkid" |