summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMike Crowe <mac@mcrowe.com>2012-02-16 15:13:35 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-02-23 23:59:37 +0000
commit8d26a9f7e606c8ae239ce9bfa521d5e94eadb9a8 (patch)
tree4d0d0371386204706f1f61289b5a5e6a4557c7e2
parent578b6f222d48b624ff78f32ae6fc9c85db1a92cf (diff)
downloadpoky-8d26a9f7e606c8ae239ce9bfa521d5e94eadb9a8.tar.gz
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 <mac@mcrowe.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-devtools/e2fsprogs/e2fsprogs_1.42.bb10
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 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 @@
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 \
@@ -34,9 +34,11 @@ do_install () {
34 34
35do_install_append () { 35do_install_append () {
36 # e2initrd_helper and the pkgconfig files belong in libdir 36 # e2initrd_helper and the pkgconfig files belong in libdir
37 install -d ${D}${libdir} 37 if [ ! ${D}${libdir} -ef ${D}${base_libdir} ]; then
38 mv ${D}${base_libdir}/e2initrd_helper ${D}${libdir} 38 install -d ${D}${libdir}
39 mv ${D}${base_libdir}/pkgconfig ${D}${libdir} 39 mv ${D}${base_libdir}/e2initrd_helper ${D}${libdir}
40 mv ${D}${base_libdir}/pkgconfig ${D}${libdir}
41 fi
40} 42}
41 43
42# blkid used to be part of e2fsprogs but is useful outside, add it 44# blkid used to be part of e2fsprogs but is useful outside, add it