[oe-commits] Wenzong Fan : git: remove unpackaged perl-native files
git at git.openembedded.org
git at git.openembedded.org
Fri Jan 25 12:44:58 UTC 2013
Module: openembedded-core.git
Branch: master
Commit: cc6b8261fa47a049e501882e9bfc40f61e603b6f
URL: http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=cc6b8261fa47a049e501882e9bfc40f61e603b6f
Author: Wenzong Fan <wenzong.fan at windriver.com>
Date: Fri Jan 25 16:06:56 2013 +0800
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]
Signed-off-by: Wenzong Fan <wenzong.fan at windriver.com>
Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
meta/recipes-devtools/git/git.inc | 6 +++++-
meta/recipes-devtools/git/git_1.8.0.2.bb | 2 +-
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/meta/recipes-devtools/git/git.inc b/meta/recipes-devtools/git/git.inc
index 82df6e3..9829eec 100644
--- a/meta/recipes-devtools/git/git.inc
+++ b/meta/recipes-devtools/git/git.inc
@@ -28,7 +28,11 @@ do_install () {
oe_runmake install DESTDIR="${D}" bindir=${bindir} \
template_dir=${datadir}/git-core/templates \
GIT_PYTHON_DIR=${D}${datadir}/git-core/python
- rm -rf ${D}${libdir}/perl-native
+
+ # ${libdir} is not applicable here, perl-native files are always
+ # installed to /usr/lib on both 32/64 bits targets.
+ rm -rf ${D}/usr/lib/perl-native
+ rmdir ${D}/usr/lib || true
}
do_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 5e5a23e..ae6fc41 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 @@
require git.inc
-PR = "r0"
+PR = "r1"
SRC_URI = "http://git-core.googlecode.com/files/git-${PV}.tar.gz"
SRC_URI[md5sum] = "1aca109d4a719fe5bc43d25927fbc7d9"
More information about the Openembedded-commits
mailing list