summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPeter A. Bigot <pab@pabigot.com>2014-09-25 08:28:29 -0500
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-09-29 12:12:45 +0100
commit392026a4561fe8bf1885b2dfd67c43d3c4b07df6 (patch)
tree56561d57ed119d381848ad37edae0de4c7086a07
parent576cb358d7a1245e3c5fb4463310552aef218fb2 (diff)
downloadpoky-392026a4561fe8bf1885b2dfd67c43d3c4b07df6.tar.gz
git: add Git perl module to perltools package
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] (From OE-Core rev: 804f8e650f433d00907ec04282c22aaff2e5c044) Signed-off-by: Peter A. Bigot <pab@pabigot.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-devtools/git/git.inc18
1 files changed, 8 insertions, 10 deletions
diff --git a/meta/recipes-devtools/git/git.inc b/meta/recipes-devtools/git/git.inc
index 7633577f67..25158330b6 100644
--- a/meta/recipes-devtools/git/git.inc
+++ b/meta/recipes-devtools/git/git.inc
@@ -30,24 +30,21 @@ do_install () {
30 oe_runmake install DESTDIR="${D}" bindir=${bindir} \ 30 oe_runmake install DESTDIR="${D}" bindir=${bindir} \
31 template_dir=${datadir}/git-core/templates \ 31 template_dir=${datadir}/git-core/templates \
32 GIT_PYTHON_DIR=${D}${datadir}/git-core/python 32 GIT_PYTHON_DIR=${D}${datadir}/git-core/python
33
34 # ${libdir} is not applicable here, perl-native files are always
35 # installed to /usr/lib on both 32/64 bits targets.
36 rm -rf ${D}${exec_prefix}/lib/perl-native
37 rmdir ${D}${exec_prefix}/lib || true
38} 33}
39 34
40PERLSEDFIXUP = " \ 35perl_native_fixup () {
41 sed -i -e 's#${STAGING_BINDIR_NATIVE}/perl-native/#${bindir}/#' \ 36 sed -i -e 's#${STAGING_BINDIR_NATIVE}/perl-native/#${bindir}/#' \
42 -e 's#${libdir}/perl-native/#${libdir}/#' \ 37 -e 's#${libdir}/perl-native/#${libdir}/#' \
43 ${@d.getVar("PERLTOOLS", True).replace(' /',d.getVar('D', True) + '/')} \ 38 ${@d.getVar("PERLTOOLS", True).replace(' /',d.getVar('D', True) + '/')}
44" 39 mv ${D}${libdir}/perl-native/perl ${D}${libdir}
40 rmdir ${D}${libdir}/perl-native || true
41}
45 42
46REL_GIT_EXEC_PATH = "${@os.path.relpath(libexecdir, bindir)}/git-core" 43REL_GIT_EXEC_PATH = "${@os.path.relpath(libexecdir, bindir)}/git-core"
47REL_GIT_TEMPLATE_DIR = "${@os.path.relpath(datadir, bindir)}/git-core/templates" 44REL_GIT_TEMPLATE_DIR = "${@os.path.relpath(datadir, bindir)}/git-core/templates"
48 45
49do_install_append_class-target () { 46do_install_append_class-target () {
50 ${PERLSEDFIXUP} 47 perl_native_fixup
51} 48}
52 49
53do_install_append_class-native() { 50do_install_append_class-native() {
@@ -60,7 +57,7 @@ do_install_append_class-nativesdk() {
60 create_wrapper ${D}${bindir}/git \ 57 create_wrapper ${D}${bindir}/git \
61 GIT_EXEC_PATH='`dirname $''realpath`'/${REL_GIT_EXEC_PATH} \ 58 GIT_EXEC_PATH='`dirname $''realpath`'/${REL_GIT_EXEC_PATH} \
62 GIT_TEMPLATE_DIR='`dirname $''realpath`'/${REL_GIT_TEMPLATE_DIR} 59 GIT_TEMPLATE_DIR='`dirname $''realpath`'/${REL_GIT_TEMPLATE_DIR}
63 ${PERLSEDFIXUP} 60 perl_native_fixup
64} 61}
65 62
66FILES_${PN} += "${datadir}/git-core ${libexecdir}/git-core/" 63FILES_${PN} += "${datadir}/git-core ${libexecdir}/git-core/"
@@ -90,6 +87,7 @@ PERLTOOLS = " \
90PACKAGES =+ "${PN}-perltools" 87PACKAGES =+ "${PN}-perltools"
91FILES_${PN}-perltools += " \ 88FILES_${PN}-perltools += " \
92 ${PERLTOOLS} \ 89 ${PERLTOOLS} \
90 ${libdir}/perl \
93 ${datadir}/perl \ 91 ${datadir}/perl \
94" 92"
95RDEPENDS_${PN}-perltools = "${PN} perl perl-module-file-path findutils" 93RDEPENDS_${PN}-perltools = "${PN} perl perl-module-file-path findutils"