From 8d26a9f7e606c8ae239ce9bfa521d5e94eadb9a8 Mon Sep 17 00:00:00 2001 From: Mike Crowe Date: Thu, 16 Feb 2012 15:13:35 +0000 Subject: e2fsprogs: Cope with ${libdir} and ${base_libdir} being the same ${libdir} and ${base_libdir} may be the same. If they are don't try and move files onto themselves. (From OE-Core rev: 992604c533c9f3c2133cfa87c1121d43a508ec4a) Signed-off-by: Mike Crowe Signed-off-by: Richard Purdie --- meta/recipes-devtools/e2fsprogs/e2fsprogs_1.42.bb | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'meta/recipes-devtools/e2fsprogs') diff --git a/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.42.bb b/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.42.bb index 2d36f697a0..6e3f7b8377 100644 --- a/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.42.bb +++ b/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.42.bb @@ -1,6 +1,6 @@ require e2fsprogs.inc -PR = "r3" +PR = "r4" SRC_URI += "file://fallocate.patch \ file://acinclude.m4 \ @@ -34,9 +34,11 @@ do_install () { do_install_append () { # e2initrd_helper and the pkgconfig files belong in libdir - install -d ${D}${libdir} - mv ${D}${base_libdir}/e2initrd_helper ${D}${libdir} - mv ${D}${base_libdir}/pkgconfig ${D}${libdir} + if [ ! ${D}${libdir} -ef ${D}${base_libdir} ]; then + install -d ${D}${libdir} + mv ${D}${base_libdir}/e2initrd_helper ${D}${libdir} + mv ${D}${base_libdir}/pkgconfig ${D}${libdir} + fi } # blkid used to be part of e2fsprogs but is useful outside, add it -- cgit v1.2.3-54-g00ecf