Op 9 mei 2014, om 08:38 heeft Saul Wold <[email protected]> het volgende geschreven:
> On 05/08/2014 10:59 PM, Koen Kooi wrote: >> >> Op 8 mei 2014, om 19:30 heeft Koen Kooi <[email protected]> het >> volgende geschreven: >> >>> >>> Op 8 mei 2014, om 18:37 heeft Saul Wold <[email protected]> het volgende >>> geschreven: >>> >>>> On 05/02/2014 01:36 AM, Koen Kooi wrote: >>>>> 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. >>>>> >>>> >>>> Seems to be a problem as RP was concerned with: >>>> >>>> >>>>> /srv/ssd/builds/world/tmp/sysroots/x86_64-linux/usr/bin/git difftool >>>>> Can't locate Error.pm in @INC (@INC contains: >>>>> /srv/ssd/builds/world/tmp/sysroots/x86_64-linux/usr/lib/perl-native/perl/5.14.3 >>>>> >>>>> /srv/ssd/builds/world/tmp/sysroots/x86_64-linux/usr/lib/perl-native/perl//5.14.3 >>>>> >>>>> /srv/ssd/builds/world/tmp/sysroots/x86_64-linux/usr/lib/perl-native/perl/ >>>>> /srv/ssd/machines/meta-intel-iot-devkit/build/tmp/sysroots/x86_64-linux/usr/lib/perl-native/perl/5.14.3 >>>>> .) at >>>>> /srv/ssd/builds/world/tmp/sysroots/x86_64-linux/usr/lib/git/git-core/git-difftool >>>>> line 17. >>>>> BEGIN failed--compilation aborted at >>>>> /srv/ssd/builds/world/tmp/sysroots/x86_64-linux/usr/lib/git/git-core/git-difftool >>>>> line 17. >>>> >>>> Doing a find in my sysroot: >>>> >>>> /srv/ssd/builds/world/tmp/sysroots/x86_64-linux/usr/lib/perl-native/perl/5.14.3/CPANPLUS/Error.pm >>>> /srv/ssd/builds/world/tmp/sysroots/x86_64-linux/usr/lib/perl/5.14.3/Error.pm >>> >>> Drat, I checked for buildpaths and didn't find anything. I'll retest and >>> send a new version hopefully tomorrow. >> >> I need to read errors better :) Do you have >> http://patches.openembedded.org/patch/70635/ applied? And did 'difftool' >> work before this? None of the perl tools worked for me due to error.pm >> missing. >> > Apparently not, this must have gotten lost during the release crazies. > > Can you please resend a rebased patch set against master with both of these > tested using the ' target. What is 'git-replacement-native' and how do I test it? regards, Koen > > Thanks > Sau! > >> >>> >>> regards, >>> >>> Koen >>> >>>> >>>> Sau! >>>> >>>> >>>>> Signed-off-by: Koen Kooi <[email protected]> >>>>> --- >>>>> meta/recipes-devtools/git/git.inc | 7 ++++++- >>>>> 1 file changed, 6 insertions(+), 1 deletion(-) >>>>> >>>>> diff --git a/meta/recipes-devtools/git/git.inc >>>>> b/meta/recipes-devtools/git/git.inc >>>>> index 73e11eb..178b768 100644 >>>>> --- a/meta/recipes-devtools/git/git.inc >>>>> +++ b/meta/recipes-devtools/git/git.inc >>>>> @@ -28,10 +28,14 @@ do_install () { >>>>> 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 +79,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" -- _______________________________________________ Openembedded-core mailing list [email protected] http://lists.openembedded.org/mailman/listinfo/openembedded-core
