diff options
| author |   Graham Gower <graham.gower@gmail.com> | 2010-12-02 12:36:02 +1030 |
|---|---|---|
| committer |   Stefan Schmidt <stefan@buglabs.net> | 2010-12-02 16:47:20 +0100 |
| commit | ec8217f4a541609952850380b266b0b751c50668 (patch) | |
| tree | 55080247d62383bd1cb3a5ae303125e182d57821 /recipes/util-linux-ng | |
| parent | caa437694c3debc20df8a0db76cd199c621b732b (diff) | |
| download | openembedded-ec8217f4a541609952850380b266b0b751c50668.tar.gz | |
util-linux-ng.inc, e2fsprogs.inc: Use update-alternatives for uuidd.
Util-linux-ng put uuidd in ${sbindir}, e2fsprogs put it in ${base_sbindir}.
This change puts both in ${base_sbindir}.
Fixes a conflict when DISTRO=micro.
| Collected errors:
| * check_data_file_clashes: Package util-linux-ng wants to install file /mnt/oe/tmp/rootfs/native-sdk-image/sbin/uuidd
| But that file is already provided by package * e2fsprogs
Signed-off-by: Graham Gower <graham.gower@gmail.com>
Acked-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'recipes/util-linux-ng')
| -rw-r--r-- | recipes/util-linux-ng/util-linux-ng.inc | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/recipes/util-linux-ng/util-linux-ng.inc b/recipes/util-linux-ng/util-linux-ng.inc index 7455098009..fbc92e4d07 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 ncurses-native lzo-native gettext-native inherit autotools gettext -INC_PR = "r33" +INC_PR = "r34" # allows for a release candidate RC ?= "" @@ -124,7 +124,7 @@ do_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" + sbinprogs_a="pivot_root hwclock mkswap shutdown mkfs.minix fsck.minix losetup swapon fdisk fsck blkid 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" @@ -219,6 +219,7 @@ pkg_postinst_${PN} () { update-alternatives --install ${base_sbindir}/vigr vigr vigr.${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 # There seems to be problem, atleast on nslu2, with these, until they are # fixed the busybox ones have higher priority @@ -232,7 +233,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; 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 chfn newgrp chsh login cal script flock uuidd; do update-alternatives --remove $i $i.${PN} done } |