Patchwork [1/1] git: remove unpackaged perl-native files

login
register
mail settings
Submitter wenzong.fan@windriver.com
Date Jan. 25, 2013, 8:06 a.m.
Message ID <06cf3d39e3067662d7cd95c7fadee3cab4a1ecb2.1359095007.git.wenzong.fan@windriver.com>
Download mbox | patch
Permalink /patch/43341/
State Accepted
Commit b77d5679c4d15e1053b7a78849b0acfe9fdef593
Headers show

Comments

wenzong.fan@windriver.com - Jan. 25, 2013, 8:06 a.m.
From: Wenzong Fan <wenzong.fan@windriver.com>

${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@windriver.com>
---
 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(-)

Patch

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"