summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPhil Blundell <philb@gnu.org>2012-10-02 18:16:24 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-10-03 10:04:56 +0100
commit7da9f109e8dad5807f3b1d3615c295c349bc7f10 (patch)
tree15a2fdaa681d45cc5467451cdba736dc339fd963
parent094c4a08787157dcbba6eab3483238595f95c38a (diff)
downloadpoky-7da9f109e8dad5807f3b1d3615c295c349bc7f10.tar.gz
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 <pb@pbcl.net> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-devtools/e2fsprogs/e2fsprogs_1.42.1.bb5
1 files changed, 3 insertions, 2 deletions
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 @@
1require e2fsprogs.inc 1require e2fsprogs.inc
2 2
3PR = "r3" 3PR = "r4"
4 4
5SRC_URI += "file://fallocate.patch \ 5SRC_URI += "file://fallocate.patch \
6 file://acinclude.m4 \ 6 file://acinclude.m4 \
@@ -32,6 +32,7 @@ do_install () {
32 rm -f ${D}${base_libdir}/pkgconfig/blkid.pc 32 rm -f ${D}${base_libdir}/pkgconfig/blkid.pc
33 rm -f ${D}${base_sbindir}/blkid 33 rm -f ${D}${base_sbindir}/blkid
34 rm -f ${D}${base_sbindir}/fsck 34 rm -f ${D}${base_sbindir}/fsck
35 rm -f ${D}${base_sbindir}/findfs
35} 36}
36 37
37do_install_append () { 38do_install_append () {
@@ -50,7 +51,7 @@ PACKAGES =+ "libcomerr libss libe2p libext2fs"
50 51
51FILES_e2fsprogs-e2fsck = "${base_sbindir}/e2fsck ${base_sbindir}/fsck.ext*" 52FILES_e2fsprogs-e2fsck = "${base_sbindir}/e2fsck ${base_sbindir}/fsck.ext*"
52FILES_e2fsprogs-mke2fs = "${base_sbindir}/mke2fs ${base_sbindir}/mkfs.ext* ${sysconfdir}/mke2fs.conf" 53FILES_e2fsprogs-mke2fs = "${base_sbindir}/mke2fs ${base_sbindir}/mkfs.ext* ${sysconfdir}/mke2fs.conf"
53FILES_e2fsprogs-tune2fs = "${base_sbindir}/tune2fs ${base_sbindir}/e2label ${base_sbindir}/findfs" 54FILES_e2fsprogs-tune2fs = "${base_sbindir}/tune2fs ${base_sbindir}/e2label"
54FILES_e2fsprogs-badblocks = "${base_sbindir}/badblocks" 55FILES_e2fsprogs-badblocks = "${base_sbindir}/badblocks"
55FILES_libcomerr = "${base_libdir}/libcom_err.so.*" 56FILES_libcomerr = "${base_libdir}/libcom_err.so.*"
56FILES_libss = "${base_libdir}/libss.so.*" 57FILES_libss = "${base_libdir}/libss.so.*"