From 3e4169d9a790c1a4ce83dc28fa5c551428874ea6 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Sat, 12 Feb 2011 19:12:13 +0000 Subject: util-linux-ng: use u-a for /sbin/blockdev * resolves conflict with latest busybox Signed-off-by: Martin Jansa Acked-by: Koen Kooi --- recipes/util-linux-ng/util-linux-ng.inc | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'recipes/util-linux-ng') diff --git a/recipes/util-linux-ng/util-linux-ng.inc b/recipes/util-linux-ng/util-linux-ng.inc index 579c8dc07b..51f25b21f9 100644 --- a/recipes/util-linux-ng/util-linux-ng.inc +++ b/recipes/util-linux-ng/util-linux-ng.inc @@ -6,7 +6,7 @@ DEPENDS_virtclass-native = "zlib-native lzo-native gettext-native" inherit autotools gettext -INC_PR = "r35" +INC_PR = "r36" # allows for a release candidate RC ?= "" @@ -126,8 +126,8 @@ do_install () { 'LDFLAGS=${LDFLAGS}' 'DESTDIR=${D}' install mkdir -p ${D}${base_bindir} - sbinprogs="agetty blockdev ctrlaltdel cfdisk" - sbinprogs_a="pivot_root hwclock mkswap shutdown mkfs.minix fsck.minix losetup swapon fdisk fsck blkid vigr vipw uuidd" + sbinprogs="agetty ctrlaltdel cfdisk" + sbinprogs_a="pivot_root hwclock mkswap shutdown mkfs.minix fsck.minix losetup swapon fdisk fsck blkid blockdev vigr vipw uuidd" usrbinprogs_a="chfn chsh hexdump last logger mesg newgrp renice wall setsid chrt reset cal script flock" usrsbinprogs_a="readprofile" binprogs_a="dmesg kill more umount mount login" @@ -220,6 +220,7 @@ pkg_postinst_${PN} () { update-alternatives --install ${base_bindir}/login login login.${PN} 100 update-alternatives --install ${base_sbindir}/vipw vipw vipw.${PN} 100 update-alternatives --install ${base_sbindir}/vigr vigr vigr.${PN} 100 + update-alternatives --install ${base_sbindir}/blockdev blockdev blockdev.${PN} 100 update-alternatives --install ${bindir}/setsid setsid setsid.${PN} 100 update-alternatives --install ${bindir}/chrt chrt chrt.${PN} 100 update-alternatives --install ${base_sbindir}/uuidd uuidd uuidd.${PN} 100 @@ -236,7 +237,7 @@ pkg_prerm_${PN} () { test -x ${base_sbindir}/pivot_root.${PN} && \ update-alternatives --remove pivot_root pivot_root.${PN} - for i in dmesg kill more halt hwclock mkswap reboot shutdown sln mkfs.minix fsck.minix hexdump setsid chrt last logger mesg renice wall vipw vigr chfn newgrp chsh login cal script flock uuidd; do + for i in dmesg kill more halt hwclock mkswap reboot shutdown sln mkfs.minix fsck.minix hexdump setsid chrt last logger mesg renice wall vipw vigr blockdev chfn newgrp chsh login cal script flock uuidd; do update-alternatives --remove $i $i.${PN} done } -- cgit 1.2.3-korg