summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWenzong Fan <wenzong.fan@windriver.com>2013-01-25 16:06:56 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-01-25 12:42:49 +0000
commitb77d5679c4d15e1053b7a78849b0acfe9fdef593 (patch)
tree96235057f58a9b18b27f1a7994cf736044b76378
parent7f08315ee5a3e4e23a46d89cfc7494c339e60113 (diff)
downloadpoky-b77d5679c4d15e1053b7a78849b0acfe9fdef593.tar.gz
git: remove unpackaged perl-native files
${libdir} is not applicable for the install path of perl-native files, files are always installed to /usr/lib no matter the target is 32/64 bits. After installing, remove unpackaged and unneeded perl-native files to prevent warnings. Fix warning: WARNING: For recipe git, the following files/directories were \ installed but not shipped in any package: ... WARNING: /usr/lib/perl-native/perl/5.14.2/Git.pm WARNING: /usr/lib/perl-native/perl/5.14.2/perllocal.pod WARNING: /usr/lib/perl-native/perl/5.14.2/Error.pm WARNING: /usr/lib/perl-native/perl/5.14.2/auto [YOCTO#3780] (From OE-Core rev: cc6b8261fa47a049e501882e9bfc40f61e603b6f) Signed-off-by: Wenzong Fan <wenzong.fan@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-devtools/git/git.inc6
-rw-r--r--meta/recipes-devtools/git/git_1.8.0.2.bb2
2 files changed, 6 insertions, 2 deletions
diff --git a/meta/recipes-devtools/git/git.inc b/meta/recipes-devtools/git/git.inc
index 82df6e3d7a..9829eec6ec 100644
--- a/meta/recipes-devtools/git/git.inc
+++ b/meta/recipes-devtools/git/git.inc
@@ -28,7 +28,11 @@ do_install () {
28 oe_runmake install DESTDIR="${D}" bindir=${bindir} \ 28 oe_runmake install DESTDIR="${D}" bindir=${bindir} \
29 template_dir=${datadir}/git-core/templates \ 29 template_dir=${datadir}/git-core/templates \
30 GIT_PYTHON_DIR=${D}${datadir}/git-core/python 30 GIT_PYTHON_DIR=${D}${datadir}/git-core/python
31 rm -rf ${D}${libdir}/perl-native 31
32 # ${libdir} is not applicable here, perl-native files are always
33 # installed to /usr/lib on both 32/64 bits targets.
34 rm -rf ${D}/usr/lib/perl-native
35 rmdir ${D}/usr/lib || true
32} 36}
33 37
34do_install_append_class-native() { 38do_install_append_class-native() {
diff --git a/meta/recipes-devtools/git/git_1.8.0.2.bb b/meta/recipes-devtools/git/git_1.8.0.2.bb
index 5e5a23eb75..ae6fc4153f 100644
--- a/meta/recipes-devtools/git/git_1.8.0.2.bb
+++ b/meta/recipes-devtools/git/git_1.8.0.2.bb
@@ -1,6 +1,6 @@
1require git.inc 1require git.inc
2 2
3PR = "r0" 3PR = "r1"
4 4
5SRC_URI = "http://git-core.googlecode.com/files/git-${PV}.tar.gz" 5SRC_URI = "http://git-core.googlecode.com/files/git-${PV}.tar.gz"
6SRC_URI[md5sum] = "1aca109d4a719fe5bc43d25927fbc7d9" 6SRC_URI[md5sum] = "1aca109d4a719fe5bc43d25927fbc7d9"