summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRobert Yang <liezhi.yang@windriver.com>2014-10-08 01:04:03 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-10-10 16:44:33 +0100
commitdd79603100c8172086fbc6fe4375a950ddd70d82 (patch)
tree3b53af32ad775a2591e164ec1880719d5b3cfddf
parentafeb590d935baba22d064387c10b7735fae788d2 (diff)
downloadpoky-dd79603100c8172086fbc6fe4375a950ddd70d82.tar.gz
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>
-rw-r--r--meta/recipes-devtools/git/git.inc7
1 files changed, 5 insertions, 2 deletions
diff --git a/meta/recipes-devtools/git/git.inc b/meta/recipes-devtools/git/git.inc
index 25158330b6..5396628790 100644
--- a/meta/recipes-devtools/git/git.inc
+++ b/meta/recipes-devtools/git/git.inc
@@ -36,8 +36,11 @@ perl_native_fixup () {
36 sed -i -e 's#${STAGING_BINDIR_NATIVE}/perl-native/#${bindir}/#' \ 36 sed -i -e 's#${STAGING_BINDIR_NATIVE}/perl-native/#${bindir}/#' \
37 -e 's#${libdir}/perl-native/#${libdir}/#' \ 37 -e 's#${libdir}/perl-native/#${libdir}/#' \
38 ${@d.getVar("PERLTOOLS", True).replace(' /',d.getVar('D', True) + '/')} 38 ${@d.getVar("PERLTOOLS", True).replace(' /',d.getVar('D', True) + '/')}
39 mv ${D}${libdir}/perl-native/perl ${D}${libdir} 39
40 rmdir ${D}${libdir}/perl-native || true 40 # ${libdir} is not applicable here, perl-native files are always
41 # installed to /usr/lib on both 32/64 bits targets.
42 mv ${D}${exec_prefix}/lib/perl-native/perl ${D}${libdir}
43 rmdir -p ${D}${exec_prefix}/lib/perl-native || true
41} 44}
42 45
43REL_GIT_EXEC_PATH = "${@os.path.relpath(libexecdir, bindir)}/git-core" 46REL_GIT_EXEC_PATH = "${@os.path.relpath(libexecdir, bindir)}/git-core"