Re: [PATCH 1/2] util-linux-ng: use u-a for /sbin/blockdev

[Koen Kooi <k.kooi@student.utwente.nl>]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

On 12-02-11 12:12, Martin Jansa wrote:
> * resolves conflict with latest busybox
> 
> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Acked-by: Koen Kooi <koen@openembedded.org>

> ---
>  recipes/util-linux-ng/util-linux-ng.inc |    9 +++++----
>  1 files changed, 5 insertions(+), 4 deletions(-)
> 
> diff --git a/recipes/util-linux-ng/util-linux-ng.inc b/recipes/util-linux-ng/util-linux-ng.inc
> index 579c8dc..51f25b2 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
>  }

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.5 (Darwin)

iD8DBQFNVnosMkyGM64RGpERAuIHAJ4+/0uyMjYywzuLbklUmV84CR/sdgCdE2qa
pm+QYnyjZ4goWqbtexZTZwI=
=QNHh
-----END PGP SIGNATURE-----