From patchwork Thu Feb 23 15:58:16 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [CONSOLIDATED, PULL, 12/25] e2fsprogs: Cope with ${libdir} and ${base_libdir} being the same Date: Thu, 23 Feb 2012 15:58:16 -0000 From: Saul Wold X-Patchwork-Id: 21807 Message-Id: <5d0114882afc03c09448fa729f5f71066630aac1.1330012543.git.sgw@linux.intel.com> To: openembedded-core@lists.openembedded.org From: Mike Crowe ${libdir} and ${base_libdir} may be the same. If they are don't try and move files onto themselves. Signed-off-by: Mike Crowe --- meta/recipes-devtools/e2fsprogs/e2fsprogs_1.42.bb | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-) diff --git a/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.42.bb b/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.42.bb index 793393e..aea7d79 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" @@ -32,9 +32,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