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 10:39:13 +0100
commitfad6d25e548cb82c2106eb30ccdc0b8f3408de0a (patch)
treeb139f769a8256218cd5752a0aea8f61fa8cc6513
parent1e6ec39d4996d2812b01c4452c579e476e70e85d (diff)
downloadopenembedded-core-contrib-fad6d25e548cb82c2106eb30ccdc0b8f3408de0a.tar.gz
openembedded-core-contrib-fad6d25e548cb82c2106eb30ccdc0b8f3408de0a.tar.bz2
openembedded-core-contrib-fad6d25e548cb82c2106eb30ccdc0b8f3408de0a.zip
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. Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
-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 () {
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"