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/e2fsprogs/e2fsprogs.inc | |
| 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/e2fsprogs/e2fsprogs.inc')
| -rw-r--r-- | recipes/e2fsprogs/e2fsprogs.inc | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/recipes/e2fsprogs/e2fsprogs.inc b/recipes/e2fsprogs/e2fsprogs.inc index 7697440261..1366ce73d6 100644 --- a/recipes/e2fsprogs/e2fsprogs.inc +++ b/recipes/e2fsprogs/e2fsprogs.inc @@ -9,7 +9,7 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/e2fsprogs/e2fsprogs-${PV}.tar.gz" S = "${WORKDIR}/e2fsprogs-${PV}" -INC_PR = "r24" +INC_PR = "r25" inherit autotools @@ -39,6 +39,7 @@ do_install_append () { rm ${D}${base_sbindir}/mkfs.ext2 rm ${D}${base_sbindir}/mkfs.ext3 rm ${D}${base_sbindir}/mkfs.ext4* + mv ${D}${base_sbindir}/uuidd ${D}${base_sbindir}/uuidd.${PN} cd ${D}/${base_sbindir} ln -sf ./e2fsck.${PN} fsck.ext2.${PN} @@ -58,10 +59,12 @@ do_install_append () { pkg_postinst_e2fsprogs () { update-alternatives --install ${base_bindir}/chattr chattr chattr.${PN} 100 + update-alternatives --install ${base_sbindir}/uuidd uuidd uuidd.${PN} 10 } pkg_prerm_e2fsprogs () { update-alternatives --remove chattr chattr.${PN} + update-alternatives --remove uuidd uuidd.${PN} } |