Openembedded Core Discussions
 help / color / mirror / Atom feed
* [PATCH] git: add Git perl module to perltools package
@ 2014-09-19 17:44 Peter A. Bigot
  2014-09-24 10:32 ` Peter A. Bigot
                   ` (2 more replies)
  0 siblings, 3 replies; 10+ messages in thread
From: Peter A. Bigot @ 2014-09-19 17:44 UTC (permalink / raw)
  To: openembedded-core

Git perl tools such as add--interactive load the Git module at runtime.
A previous patch to eliminate a QA error by deleting it instead of
packaging it was incorrect.

    beaglebone[62]$ git add -i
    Can't locate Git.pm in @INC (you may need to install the Git module) (@INC contains: /usr/lib/perl/5.20.0 /prj/pab/Utils/lib/perl5/linux-arm/5.020000 /prj/pab/Utils/lib/perl5/ /prj/pab/Utils/lib/perl5/site_perl/linux-arm /prj/pab/Utils/lib/perl5/site_perl /etc/perl /usr/lib/perl/site_perl/5.20.0/ /usr/lib/perl/site_perl/5.20.0 /usr/lib/perl/vendor_perl/5.20.0/ /usr/lib/perl/vendor_perl/5.20.0 /usr/lib/perl/5.20.0/ /usr/local/lib/site_perl .) at /usr/lib/git/git-core/git-add--interactive line 7.
    BEGIN failed--compilation aborted at /usr/lib/git/git-core/git-add--interactive line 7.

[YOCTO#3780]

Signed-off-by: Peter A. Bigot <pab@pabigot.com>
---
 meta/recipes-devtools/git/git.inc | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/meta/recipes-devtools/git/git.inc b/meta/recipes-devtools/git/git.inc
index 7633577..3580275 100644
--- a/meta/recipes-devtools/git/git.inc
+++ b/meta/recipes-devtools/git/git.inc
@@ -30,11 +30,6 @@ do_install () {
 	oe_runmake install DESTDIR="${D}" bindir=${bindir} \
 		template_dir=${datadir}/git-core/templates \
 		GIT_PYTHON_DIR=${D}${datadir}/git-core/python
-
-	# ${libdir} is not applicable here, perl-native files are always
-	# installed to /usr/lib on both 32/64 bits targets.
-	rm -rf ${D}${exec_prefix}/lib/perl-native
-	rmdir ${D}${exec_prefix}/lib || true
 }
 
 PERLSEDFIXUP = " \
@@ -48,6 +43,8 @@ REL_GIT_TEMPLATE_DIR = "${@os.path.relpath(datadir, bindir)}/git-core/templates"
 
 do_install_append_class-target () {
 	${PERLSEDFIXUP}
+	mv ${D}${libdir}/perl-native/perl ${D}${libdir}
+	rmdir ${D}${libdir}/perl-native || true
 }
 
 do_install_append_class-native() {
@@ -90,6 +87,7 @@ PERLTOOLS = " \
 PACKAGES =+ "${PN}-perltools"
 FILES_${PN}-perltools += " \
     ${PERLTOOLS} \
+    ${libdir}/perl \
     ${datadir}/perl \
 "
 RDEPENDS_${PN}-perltools = "${PN} perl perl-module-file-path findutils"
-- 
1.8.5.5



^ permalink raw reply related	[flat|nested] 10+ messages in thread
end of thread, other threads:[~2014-10-08  3:44 UTC | newest]

Thread overview: 10+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-09-19 17:44 [PATCH] git: add Git perl module to perltools package Peter A. Bigot
2014-09-24 10:32 ` Peter A. Bigot
2014-09-25 10:49   ` Burton, Ross
2014-09-25 11:16     ` Peter A. Bigot
2014-09-25 11:17       ` Paul Eggleton
2014-09-25 11:35         ` Peter A. Bigot
2014-09-25 11:41           ` Burton, Ross
2014-09-25 11:23       ` Burton, Ross
2014-09-25 13:28 ` [PATCH v2] " Peter A. Bigot
2014-10-08  3:44 ` [PATCH] " Robert Yang

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox