Git.pm wasn't ending up in the package because do_install removed it with a misleading comment about multilib. Workaround the problem so that Git.pm ends up in the correct dir *and* doesn't get deleted.
Signed-off-by: Koen Kooi <[email protected]> --- meta/recipes-devtools/git/git.inc | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/meta/recipes-devtools/git/git.inc b/meta/recipes-devtools/git/git.inc index 73e11eb..c6ff843 100644 --- a/meta/recipes-devtools/git/git.inc +++ b/meta/recipes-devtools/git/git.inc @@ -23,15 +23,22 @@ do_compile_prepend () { rm -f perl/perl.mak } +# The perl portion fails with -j16 +PARALLEL_MAKEINST = "" + do_install () { oe_runmake install DESTDIR="${D}" bindir=${bindir} \ template_dir=${datadir}/git-core/templates \ GIT_PYTHON_DIR=${D}${datadir}/git-core/python + cd ${B}/perl && oe_runmake install DESTDIR="${D}" bindir=${bindir} + # ${libdir} is not applicable here, perl-native files are always # installed to /usr/lib on both 32/64 bits targets. + # Fix up build paths and point to target locations. + mv ${D}${exec_prefix}/lib/perl-native/perl ${D}${exec_prefix}/lib/perl + sed -i -e s:${D}::g ${D}${exec_prefix}/lib/perl/*/auto/Git/.packlist rm -rf ${D}${exec_prefix}/lib/perl-native - rmdir ${D}${exec_prefix}/lib || true } PERLSEDFIXUP = " \ @@ -75,6 +82,7 @@ PERLTOOLS = " \ PACKAGES =+ "${PN}-perltools" FILES_${PN}-perltools += " \ ${PERLTOOLS} \ + ${prefix}/lib/perl \ ${datadir}/perl \ " RDEPENDS_${PN}-perltools = "${PN} perl perl-module-file-path liberror-perl findutils" -- 1.9.0 -- _______________________________________________ Openembedded-devel mailing list [email protected] http://lists.openembedded.org/mailman/listinfo/openembedded-devel
