From 7da9f109e8dad5807f3b1d3615c295c349bc7f10 Mon Sep 17 00:00:00 2001 From: Phil Blundell Date: Tue, 2 Oct 2012 18:16:24 +0100 Subject: e2fsprogs: Don't install findfs This binary is provided by util-linux nowadays. Fixes: WARNING: The recipe is trying to install files into a shared area when those files already exist. Those files are: /fast/jenkins/workspace/.../tmp-eglibc/sysroots/x86_64-linux/sbin/findfs (From OE-Core rev: e71c6bb75239926aceebbb53d158cbf8de6112a4) Signed-off-by: Phil Blundell Signed-off-by: Richard Purdie --- meta/recipes-devtools/e2fsprogs/e2fsprogs_1.42.1.bb | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'meta') diff --git a/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.42.1.bb b/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.42.1.bb index 3869c34830..5d62ea0910 100644 --- a/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.42.1.bb +++ b/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.42.1.bb @@ -1,6 +1,6 @@ require e2fsprogs.inc -PR = "r3" +PR = "r4" SRC_URI += "file://fallocate.patch \ file://acinclude.m4 \ @@ -32,6 +32,7 @@ do_install () { rm -f ${D}${base_libdir}/pkgconfig/blkid.pc rm -f ${D}${base_sbindir}/blkid rm -f ${D}${base_sbindir}/fsck + rm -f ${D}${base_sbindir}/findfs } do_install_append () { @@ -50,7 +51,7 @@ PACKAGES =+ "libcomerr libss libe2p libext2fs" FILES_e2fsprogs-e2fsck = "${base_sbindir}/e2fsck ${base_sbindir}/fsck.ext*" FILES_e2fsprogs-mke2fs = "${base_sbindir}/mke2fs ${base_sbindir}/mkfs.ext* ${sysconfdir}/mke2fs.conf" -FILES_e2fsprogs-tune2fs = "${base_sbindir}/tune2fs ${base_sbindir}/e2label ${base_sbindir}/findfs" +FILES_e2fsprogs-tune2fs = "${base_sbindir}/tune2fs ${base_sbindir}/e2label" FILES_e2fsprogs-badblocks = "${base_sbindir}/badblocks" FILES_libcomerr = "${base_libdir}/libcom_err.so.*" FILES_libss = "${base_libdir}/libss.so.*" -- cgit v1.2.3-54-g00ecf