git: fix do_install error

Fixed when MACHINE = qemux86-64 and libdir = /usr/lib64:
mv: cannot stat `/path/to/image/usr/lib64/perl-native/perl': No such file or directory

The perl-native files are always installed to /usr/lib on both 32/64
bits targets.

(From OE-Core rev: fad6d25e548cb82c2106eb30ccdc0b8f3408de0a)

Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

diff --git a/meta/recipes-devtools/git/git.inc b/meta/recipes-devtools/git/git.inc
index 2515833..5396628 100644 (file)
--- a/meta/recipes-devtools/git/git.inc
+++ b/meta/recipes-devtools/git/git.inc
@@ -36,8 +36,11 @@ perl_native_fixup () {
        sed -i -e 's#${STAGING_BINDIR_NATIVE}/perl-native/#${bindir}/#' \
               -e 's#${libdir}/perl-native/#${libdir}/#' \
            ${@d.getVar("PERLTOOLS", True).replace(' /',d.getVar('D', True) + '/')}
-       mv ${D}${libdir}/perl-native/perl ${D}${libdir}
-       rmdir ${D}${libdir}/perl-native || true
+
+       # ${libdir} is not applicable here, perl-native files are always
+       # installed to /usr/lib on both 32/64 bits targets.
+       mv ${D}${exec_prefix}/lib/perl-native/perl ${D}${libdir}
+       rmdir -p ${D}${exec_prefix}/lib/perl-native || true
 }
 
 REL_GIT_EXEC_PATH = "${@os.path.relpath(libexecdir, bindir)}/git-core"