* [PATCH 1/3] git: fix perl binding installation
@ 2014-04-17 9:07 Koen Kooi
2014-04-17 9:07 ` [PATCH 2/3] liberror-perl: add 0.17022 Koen Kooi
` (2 more replies)
0 siblings, 3 replies; 8+ messages in thread
From: Koen Kooi @ 2014-04-17 9:07 UTC (permalink / raw)
To: openembedded-core; +Cc: Koen Kooi
Git.pm wasn't ending up in the package because do_install removed it
with a misleading comment about multilib. Fix the problem at the source
so that Git.pm ends up in the correct dir *and* doesn't get deleted.
The perl.mak file gets updated during the regular do_install, so add an
extra make install step to install the *.pm files to the correct
directory.
This is the first step in making git-perltools actually work.
Signed-off-by: Koen Kooi <koen.kooi@linaro.org>
---
meta/recipes-devtools/git/git.inc | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/meta/recipes-devtools/git/git.inc b/meta/recipes-devtools/git/git.inc
index f5013f1..888b2a5 100644
--- a/meta/recipes-devtools/git/git.inc
+++ b/meta/recipes-devtools/git/git.inc
@@ -28,10 +28,16 @@ do_install () {
template_dir=${datadir}/git-core/templates \
GIT_PYTHON_DIR=${D}${datadir}/git-core/python
+ sed -i -e 's#${STAGING_BINDIR_NATIVE}/perl-native/#${bindir}/#' \
+ -e 's#${STAGING_LIBDIR_NATIVE}/#${libdir}/#' \
+ -e 's#/lib/perl-native#/lib#g' \
+ ${S}/perl/perl.mak
+
+ cd ${S}/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.
rm -rf ${D}${exec_prefix}/lib/perl-native
- rmdir ${D}${exec_prefix}/lib || true
}
PERLSEDFIXUP = " \
@@ -75,6 +81,7 @@ PERLTOOLS = " \
PACKAGES =+ "${PN}-perltools"
FILES_${PN}-perltools += " \
${PERLTOOLS} \
+ ${prefix}/lib/perl \
${datadir}/perl \
"
RDEPENDS_${PN}-perltools = "${PN} perl perl-module-file-path findutils"
--
1.9.0
^ permalink raw reply related [flat|nested] 8+ messages in thread* [PATCH 2/3] liberror-perl: add 0.17022 2014-04-17 9:07 [PATCH 1/3] git: fix perl binding installation Koen Kooi @ 2014-04-17 9:07 ` Koen Kooi 2014-04-17 9:07 ` [PATCH 3/3] git: add a runtime depency for liberror-perl to git-perltools Koen Kooi 2014-04-18 20:25 ` [PATCH 1/3] git: fix perl binding installation Saul Wold 2 siblings, 0 replies; 8+ messages in thread From: Koen Kooi @ 2014-04-17 9:07 UTC (permalink / raw) To: openembedded-core; +Cc: Koen Kooi This is needed for git-perltools to work: koen@beast:/build/v2014.06/sources/meta-openembedded$ git send-email -M -1 --to openembedded-devel@lists.openembedded.org --subject-prefix=meta-oe][PATCH Can't locate Error.pm in @INC (@INC contains: /usr/lib/perl/5.14.3 /etc/perl /usr/lib/perl/site_perl/5.14.3/ /usr/lib/perl/site_perl/5.14.3 /usr/lib/perl/vendor_perl/5.14.3/ /usr/lib/perl/vendor_perl/5.14.3 /usr/lib/perl/5.14.3/ /usr/local/lib/site_perl .) at /usr/lib/git/git-core/git-send-email line 30. Signed-off-by: Koen Kooi <koen.kooi@linaro.org> --- .../recipes-devtools/perl/liberror-perl_0.17022.bb | 27 ++++++++++++++++++++++ 1 file changed, 27 insertions(+) create mode 100644 meta/recipes-devtools/perl/liberror-perl_0.17022.bb diff --git a/meta/recipes-devtools/perl/liberror-perl_0.17022.bb b/meta/recipes-devtools/perl/liberror-perl_0.17022.bb new file mode 100644 index 0000000..071f4b7 --- /dev/null +++ b/meta/recipes-devtools/perl/liberror-perl_0.17022.bb @@ -0,0 +1,27 @@ +SUMMARY = "Error - Error/exception handling in an OO-ish way" +DESCRIPTION = "The Error package provides two interfaces. Firstly \ +Error provides a procedural interface to exception handling. \ +Secondly Error is a base class for errors/exceptions that can \ +either be thrown, for subsequent catch, or can simply be recorded." + +SECTION = "libs" +LICENSE = "Artistic-1.0 | GPL-1.0+" + +LIC_FILES_CHKSUM = "file://LICENSE;md5=8f3499d09ee74a050c0319391ff9d100" + +DEPENDS += "perl" + +SRC_URI = "http://cpan.metacpan.org/authors/id/S/SH/SHLOMIF/Error-${PV}.tar.gz" +SRC_URI[md5sum] = "f4d825f4be915ae90bf2e0d66734956b" +SRC_URI[sha256sum] = "cab74f04fb3af7088cefc2f6f96800ee52d34b82928bbb35ca51a0e5b5f9f7ef" + +S = "${WORKDIR}/Error-${PV}" + +inherit cpan + +do_compile() { + export LIBC="$(find ${STAGING_DIR_TARGET}/${base_libdir}/ -name 'libc-*.so')" + cpan_do_compile +} + +BBCLASSEXTEND = "native" -- 1.9.0 ^ permalink raw reply related [flat|nested] 8+ messages in thread
* [PATCH 3/3] git: add a runtime depency for liberror-perl to git-perltools 2014-04-17 9:07 [PATCH 1/3] git: fix perl binding installation Koen Kooi 2014-04-17 9:07 ` [PATCH 2/3] liberror-perl: add 0.17022 Koen Kooi @ 2014-04-17 9:07 ` Koen Kooi 2014-04-18 20:25 ` [PATCH 1/3] git: fix perl binding installation Saul Wold 2 siblings, 0 replies; 8+ messages in thread From: Koen Kooi @ 2014-04-17 9:07 UTC (permalink / raw) To: openembedded-core; +Cc: Koen Kooi This makes at least git-send-email work. Signed-off-by: Koen Kooi <koen.kooi@linaro.org> --- meta/recipes-devtools/git/git.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-devtools/git/git.inc b/meta/recipes-devtools/git/git.inc index 888b2a5..1e819dc 100644 --- a/meta/recipes-devtools/git/git.inc +++ b/meta/recipes-devtools/git/git.inc @@ -84,7 +84,7 @@ FILES_${PN}-perltools += " \ ${prefix}/lib/perl \ ${datadir}/perl \ " -RDEPENDS_${PN}-perltools = "${PN} perl perl-module-file-path findutils" +RDEPENDS_${PN}-perltools = "${PN} perl perl-module-file-path liberror-perl findutils" PACKAGES =+ "${PN}-python" FILES_${PN}-python = "${libdir}/python*" -- 1.9.0 ^ permalink raw reply related [flat|nested] 8+ messages in thread
* Re: [PATCH 1/3] git: fix perl binding installation 2014-04-17 9:07 [PATCH 1/3] git: fix perl binding installation Koen Kooi 2014-04-17 9:07 ` [PATCH 2/3] liberror-perl: add 0.17022 Koen Kooi 2014-04-17 9:07 ` [PATCH 3/3] git: add a runtime depency for liberror-perl to git-perltools Koen Kooi @ 2014-04-18 20:25 ` Saul Wold 2014-04-19 7:24 ` Koen Kooi 2 siblings, 1 reply; 8+ messages in thread From: Saul Wold @ 2014-04-18 20:25 UTC (permalink / raw) To: Koen Kooi, openembedded-core On 04/17/2014 02:07 AM, Koen Kooi wrote: > Git.pm wasn't ending up in the package because do_install removed it > with a misleading comment about multilib. Fix the problem at the source > so that Git.pm ends up in the correct dir *and* doesn't get deleted. > > The perl.mak file gets updated during the regular do_install, so add an > extra make install step to install the *.pm files to the correct > directory. > > This is the first step in making git-perltools actually work. > > Signed-off-by: Koen Kooi <koen.kooi@linaro.org> > --- > meta/recipes-devtools/git/git.inc | 9 ++++++++- > 1 file changed, 8 insertions(+), 1 deletion(-) > > diff --git a/meta/recipes-devtools/git/git.inc b/meta/recipes-devtools/git/git.inc > index f5013f1..888b2a5 100644 > --- a/meta/recipes-devtools/git/git.inc > +++ b/meta/recipes-devtools/git/git.inc > @@ -28,10 +28,16 @@ do_install () { > template_dir=${datadir}/git-core/templates \ > GIT_PYTHON_DIR=${D}${datadir}/git-core/python > > + sed -i -e 's#${STAGING_BINDIR_NATIVE}/perl-native/#${bindir}/#' \ > + -e 's#${STAGING_LIBDIR_NATIVE}/#${libdir}/#' \ > + -e 's#/lib/perl-native#/lib#g' \ > + ${S}/perl/perl.mak > + > + cd ${S}/perl && oe_runmake install DESTDIR="${D}" bindir=${bindir} > + Koen, This still seems to have a problem, and yes I have all 3 patches > | NOTE: make -j 16 NO_PYTHON=1 RUNTIME_PREFIX=1 NO_GETTEXT=1 install DESTDIR=/srv/hdd/builds/world/tmp/work/ppc7400-poky-linux/git/1.9.0-r0/image bindir=/usr/bin > | make[1]: Entering directory `/srv/hdd/builds/world/tmp/work/ppc7400-poky-linux/git/1.9.0-r0/git-1.9.0/perl' > | make[1]: *** No rule to make target `/usr/lib/perl/5.14.3/Config.pm', needed by `perl.mak'. Stop. > | make[1]: Leaving directory `/srv/hdd/builds/world/tmp/work/ppc7400-poky-linux/git/1.9.0-r0/git-1.9.0/perl' > | make: *** [install] Error 2 > | ERROR: oe_runmake failed Sau! > # ${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 = " \ > @@ -75,6 +81,7 @@ PERLTOOLS = " \ > PACKAGES =+ "${PN}-perltools" > FILES_${PN}-perltools += " \ > ${PERLTOOLS} \ > + ${prefix}/lib/perl \ > ${datadir}/perl \ > " > RDEPENDS_${PN}-perltools = "${PN} perl perl-module-file-path findutils" > ^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH 1/3] git: fix perl binding installation 2014-04-18 20:25 ` [PATCH 1/3] git: fix perl binding installation Saul Wold @ 2014-04-19 7:24 ` Koen Kooi 2014-04-19 15:47 ` Saul Wold 0 siblings, 1 reply; 8+ messages in thread From: Koen Kooi @ 2014-04-19 7:24 UTC (permalink / raw) To: Saul Wold; +Cc: Koen Kooi, openembedded-core Op 18 apr. 2014, om 22:25 heeft Saul Wold <sgw@linux.intel.com> het volgende geschreven: > On 04/17/2014 02:07 AM, Koen Kooi wrote: >> Git.pm wasn't ending up in the package because do_install removed it >> with a misleading comment about multilib. Fix the problem at the source >> so that Git.pm ends up in the correct dir *and* doesn't get deleted. >> >> The perl.mak file gets updated during the regular do_install, so add an >> extra make install step to install the *.pm files to the correct >> directory. >> >> This is the first step in making git-perltools actually work. >> >> Signed-off-by: Koen Kooi <koen.kooi@linaro.org> >> --- >> meta/recipes-devtools/git/git.inc | 9 ++++++++- >> 1 file changed, 8 insertions(+), 1 deletion(-) >> >> diff --git a/meta/recipes-devtools/git/git.inc b/meta/recipes-devtools/git/git.inc >> index f5013f1..888b2a5 100644 >> --- a/meta/recipes-devtools/git/git.inc >> +++ b/meta/recipes-devtools/git/git.inc >> @@ -28,10 +28,16 @@ do_install () { >> template_dir=${datadir}/git-core/templates \ >> GIT_PYTHON_DIR=${D}${datadir}/git-core/python >> >> + sed -i -e 's#${STAGING_BINDIR_NATIVE}/perl-native/#${bindir}/#' \ >> + -e 's#${STAGING_LIBDIR_NATIVE}/#${libdir}/#' \ >> + -e 's#/lib/perl-native#/lib#g' \ >> + ${S}/perl/perl.mak >> + >> + cd ${S}/perl && oe_runmake install DESTDIR="${D}" bindir=${bindir} >> + > > Koen, > > This still seems to have a problem, and yes I have all 3 patches > >> | NOTE: make -j 16 NO_PYTHON=1 RUNTIME_PREFIX=1 NO_GETTEXT=1 install DESTDIR=/srv/hdd/builds/world/tmp/work/ppc7400-poky-linux/git/1.9.0-r0/image bindir=/usr/bin >> | make[1]: Entering directory `/srv/hdd/builds/world/tmp/work/ppc7400-poky-linux/git/1.9.0-r0/git-1.9.0/perl' >> | make[1]: *** No rule to make target `/usr/lib/perl/5.14.3/Config.pm', needed by `perl.mak'. Stop. >> | make[1]: Leaving directory `/srv/hdd/builds/world/tmp/work/ppc7400-poky-linux/git/1.9.0-r0/git-1.9.0/perl' >> | make: *** [install] Error 2 >> | ERROR: oe_runmake failed I've seen that pop up as well, but I couldn't reproduce that with 'bitbake -c clean git ; bitbake git'. I only tested with -j4, I'll retest with -j16. Are you seeing this on all builds or only some of them? regards, Koen > > > Sau! > > > >> # ${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 = " \ >> @@ -75,6 +81,7 @@ PERLTOOLS = " \ >> PACKAGES =+ "${PN}-perltools" >> FILES_${PN}-perltools += " \ >> ${PERLTOOLS} \ >> + ${prefix}/lib/perl \ >> ${datadir}/perl \ >> " >> RDEPENDS_${PN}-perltools = "${PN} perl perl-module-file-path findutils" >> > -- > _______________________________________________ > Openembedded-core mailing list > Openembedded-core@lists.openembedded.org > http://lists.openembedded.org/mailman/listinfo/openembedded-core ^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH 1/3] git: fix perl binding installation 2014-04-19 7:24 ` Koen Kooi @ 2014-04-19 15:47 ` Saul Wold 2014-04-20 8:02 ` Koen Kooi 0 siblings, 1 reply; 8+ messages in thread From: Saul Wold @ 2014-04-19 15:47 UTC (permalink / raw) To: Koen Kooi; +Cc: Koen Kooi, openembedded-core On 04/19/2014 12:24 AM, Koen Kooi wrote: > > Op 18 apr. 2014, om 22:25 heeft Saul Wold <sgw@linux.intel.com> het volgende geschreven: > >> On 04/17/2014 02:07 AM, Koen Kooi wrote: >>> Git.pm wasn't ending up in the package because do_install removed it >>> with a misleading comment about multilib. Fix the problem at the source >>> so that Git.pm ends up in the correct dir *and* doesn't get deleted. >>> >>> The perl.mak file gets updated during the regular do_install, so add an >>> extra make install step to install the *.pm files to the correct >>> directory. >>> >>> This is the first step in making git-perltools actually work. >>> >>> Signed-off-by: Koen Kooi <koen.kooi@linaro.org> >>> --- >>> meta/recipes-devtools/git/git.inc | 9 ++++++++- >>> 1 file changed, 8 insertions(+), 1 deletion(-) >>> >>> diff --git a/meta/recipes-devtools/git/git.inc b/meta/recipes-devtools/git/git.inc >>> index f5013f1..888b2a5 100644 >>> --- a/meta/recipes-devtools/git/git.inc >>> +++ b/meta/recipes-devtools/git/git.inc >>> @@ -28,10 +28,16 @@ do_install () { >>> template_dir=${datadir}/git-core/templates \ >>> GIT_PYTHON_DIR=${D}${datadir}/git-core/python >>> >>> + sed -i -e 's#${STAGING_BINDIR_NATIVE}/perl-native/#${bindir}/#' \ >>> + -e 's#${STAGING_LIBDIR_NATIVE}/#${libdir}/#' \ >>> + -e 's#/lib/perl-native#/lib#g' \ >>> + ${S}/perl/perl.mak >>> + >>> + cd ${S}/perl && oe_runmake install DESTDIR="${D}" bindir=${bindir} >>> + >> >> Koen, >> >> This still seems to have a problem, and yes I have all 3 patches >> >>> | NOTE: make -j 16 NO_PYTHON=1 RUNTIME_PREFIX=1 NO_GETTEXT=1 install DESTDIR=/srv/hdd/builds/world/tmp/work/ppc7400-poky-linux/git/1.9.0-r0/image bindir=/usr/bin >>> | make[1]: Entering directory `/srv/hdd/builds/world/tmp/work/ppc7400-poky-linux/git/1.9.0-r0/git-1.9.0/perl' >>> | make[1]: *** No rule to make target `/usr/lib/perl/5.14.3/Config.pm', needed by `perl.mak'. Stop. >>> | make[1]: Leaving directory `/srv/hdd/builds/world/tmp/work/ppc7400-poky-linux/git/1.9.0-r0/git-1.9.0/perl' >>> | make: *** [install] Error 2 >>> | ERROR: oe_runmake failed > > I've seen that pop up as well, but I couldn't reproduce that with 'bitbake -c clean git ; bitbake git'. I only tested with -j4, I'll retest with -j16. Are you seeing this on all builds or only some of them? > I can reproduce this on my local build server at -j 16 everytime. Sau! > regards, > > Koen > > > >> >> >> Sau! >> >> >> >>> # ${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 = " \ >>> @@ -75,6 +81,7 @@ PERLTOOLS = " \ >>> PACKAGES =+ "${PN}-perltools" >>> FILES_${PN}-perltools += " \ >>> ${PERLTOOLS} \ >>> + ${prefix}/lib/perl \ >>> ${datadir}/perl \ >>> " >>> RDEPENDS_${PN}-perltools = "${PN} perl perl-module-file-path findutils" >>> >> -- >> _______________________________________________ >> Openembedded-core mailing list >> Openembedded-core@lists.openembedded.org >> http://lists.openembedded.org/mailman/listinfo/openembedded-core > > > ^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH 1/3] git: fix perl binding installation 2014-04-19 15:47 ` Saul Wold @ 2014-04-20 8:02 ` Koen Kooi 2014-04-22 12:50 ` Koen Kooi 0 siblings, 1 reply; 8+ messages in thread From: Koen Kooi @ 2014-04-20 8:02 UTC (permalink / raw) To: Saul Wold; +Cc: Koen Kooi, openembedded-core Op 19 apr. 2014, om 17:47 heeft Saul Wold <sgw@linux.intel.com> het volgende geschreven: > On 04/19/2014 12:24 AM, Koen Kooi wrote: >> >> Op 18 apr. 2014, om 22:25 heeft Saul Wold <sgw@linux.intel.com> het volgende geschreven: >> >>> On 04/17/2014 02:07 AM, Koen Kooi wrote: >>>> Git.pm wasn't ending up in the package because do_install removed it >>>> with a misleading comment about multilib. Fix the problem at the source >>>> so that Git.pm ends up in the correct dir *and* doesn't get deleted. >>>> >>>> The perl.mak file gets updated during the regular do_install, so add an >>>> extra make install step to install the *.pm files to the correct >>>> directory. >>>> >>>> This is the first step in making git-perltools actually work. >>>> >>>> Signed-off-by: Koen Kooi <koen.kooi@linaro.org> >>>> --- >>>> meta/recipes-devtools/git/git.inc | 9 ++++++++- >>>> 1 file changed, 8 insertions(+), 1 deletion(-) >>>> >>>> diff --git a/meta/recipes-devtools/git/git.inc b/meta/recipes-devtools/git/git.inc >>>> index f5013f1..888b2a5 100644 >>>> --- a/meta/recipes-devtools/git/git.inc >>>> +++ b/meta/recipes-devtools/git/git.inc >>>> @@ -28,10 +28,16 @@ do_install () { >>>> template_dir=${datadir}/git-core/templates \ >>>> GIT_PYTHON_DIR=${D}${datadir}/git-core/python >>>> >>>> + sed -i -e 's#${STAGING_BINDIR_NATIVE}/perl-native/#${bindir}/#' \ >>>> + -e 's#${STAGING_LIBDIR_NATIVE}/#${libdir}/#' \ >>>> + -e 's#/lib/perl-native#/lib#g' \ >>>> + ${S}/perl/perl.mak >>>> + >>>> + cd ${S}/perl && oe_runmake install DESTDIR="${D}" bindir=${bindir} >>>> + >>> >>> Koen, >>> >>> This still seems to have a problem, and yes I have all 3 patches >>> >>>> | NOTE: make -j 16 NO_PYTHON=1 RUNTIME_PREFIX=1 NO_GETTEXT=1 install DESTDIR=/srv/hdd/builds/world/tmp/work/ppc7400-poky-linux/git/1.9.0-r0/image bindir=/usr/bin >>>> | make[1]: Entering directory `/srv/hdd/builds/world/tmp/work/ppc7400-poky-linux/git/1.9.0-r0/git-1.9.0/perl' >>>> | make[1]: *** No rule to make target `/usr/lib/perl/5.14.3/Config.pm', needed by `perl.mak'. Stop. >>>> | make[1]: Leaving directory `/srv/hdd/builds/world/tmp/work/ppc7400-poky-linux/git/1.9.0-r0/git-1.9.0/perl' >>>> | make: *** [install] Error 2 >>>> | ERROR: oe_runmake failed >> >> I've seen that pop up as well, but I couldn't reproduce that with 'bitbake -c clean git ; bitbake git'. I only tested with -j4, I'll retest with -j16. Are you seeing this on all builds or only some of them? >> > > I can reproduce this on my local build server at -j 16 everytime. -j16 instead of -j4 triggers an selinux error on my laptop, so this patch needs rethinking. I'll have a look at this when I get back to work on tuesday. regards, Koen > > Sau! > >> regards, >> >> Koen >> >> >> >>> >>> >>> Sau! >>> >>> >>> >>>> # ${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 = " \ >>>> @@ -75,6 +81,7 @@ PERLTOOLS = " \ >>>> PACKAGES =+ "${PN}-perltools" >>>> FILES_${PN}-perltools += " \ >>>> ${PERLTOOLS} \ >>>> + ${prefix}/lib/perl \ >>>> ${datadir}/perl \ >>>> " >>>> RDEPENDS_${PN}-perltools = "${PN} perl perl-module-file-path findutils" >>>> >>> -- >>> _______________________________________________ >>> Openembedded-core mailing list >>> Openembedded-core@lists.openembedded.org >>> http://lists.openembedded.org/mailman/listinfo/openembedded-core ^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH 1/3] git: fix perl binding installation 2014-04-20 8:02 ` Koen Kooi @ 2014-04-22 12:50 ` Koen Kooi 0 siblings, 0 replies; 8+ messages in thread From: Koen Kooi @ 2014-04-22 12:50 UTC (permalink / raw) To: Saul Wold; +Cc: Koen Kooi, openembedded-core Op 20 apr. 2014, om 10:02 heeft Koen Kooi <koen@dominion.thruhere.net> het volgende geschreven: > > Op 19 apr. 2014, om 17:47 heeft Saul Wold <sgw@linux.intel.com> het volgende geschreven: > >> On 04/19/2014 12:24 AM, Koen Kooi wrote: >>> >>> Op 18 apr. 2014, om 22:25 heeft Saul Wold <sgw@linux.intel.com> het volgende geschreven: >>> >>>> On 04/17/2014 02:07 AM, Koen Kooi wrote: >>>>> Git.pm wasn't ending up in the package because do_install removed it >>>>> with a misleading comment about multilib. Fix the problem at the source >>>>> so that Git.pm ends up in the correct dir *and* doesn't get deleted. >>>>> >>>>> The perl.mak file gets updated during the regular do_install, so add an >>>>> extra make install step to install the *.pm files to the correct >>>>> directory. >>>>> >>>>> This is the first step in making git-perltools actually work. >>>>> >>>>> Signed-off-by: Koen Kooi <koen.kooi@linaro.org> >>>>> --- >>>>> meta/recipes-devtools/git/git.inc | 9 ++++++++- >>>>> 1 file changed, 8 insertions(+), 1 deletion(-) >>>>> >>>>> diff --git a/meta/recipes-devtools/git/git.inc b/meta/recipes-devtools/git/git.inc >>>>> index f5013f1..888b2a5 100644 >>>>> --- a/meta/recipes-devtools/git/git.inc >>>>> +++ b/meta/recipes-devtools/git/git.inc >>>>> @@ -28,10 +28,16 @@ do_install () { >>>>> template_dir=${datadir}/git-core/templates \ >>>>> GIT_PYTHON_DIR=${D}${datadir}/git-core/python >>>>> >>>>> + sed -i -e 's#${STAGING_BINDIR_NATIVE}/perl-native/#${bindir}/#' \ >>>>> + -e 's#${STAGING_LIBDIR_NATIVE}/#${libdir}/#' \ >>>>> + -e 's#/lib/perl-native#/lib#g' \ >>>>> + ${S}/perl/perl.mak >>>>> + >>>>> + cd ${S}/perl && oe_runmake install DESTDIR="${D}" bindir=${bindir} >>>>> + >>>> >>>> Koen, >>>> >>>> This still seems to have a problem, and yes I have all 3 patches >>>> >>>>> | NOTE: make -j 16 NO_PYTHON=1 RUNTIME_PREFIX=1 NO_GETTEXT=1 install DESTDIR=/srv/hdd/builds/world/tmp/work/ppc7400-poky-linux/git/1.9.0-r0/image bindir=/usr/bin >>>>> | make[1]: Entering directory `/srv/hdd/builds/world/tmp/work/ppc7400-poky-linux/git/1.9.0-r0/git-1.9.0/perl' >>>>> | make[1]: *** No rule to make target `/usr/lib/perl/5.14.3/Config.pm', needed by `perl.mak'. Stop. >>>>> | make[1]: Leaving directory `/srv/hdd/builds/world/tmp/work/ppc7400-poky-linux/git/1.9.0-r0/git-1.9.0/perl' >>>>> | make: *** [install] Error 2 >>>>> | ERROR: oe_runmake failed >>> >>> I've seen that pop up as well, but I couldn't reproduce that with 'bitbake -c clean git ; bitbake git'. I only tested with -j4, I'll retest with -j16. Are you seeing this on all builds or only some of them? >>> >> >> I can reproduce this on my local build server at -j 16 everytime. > > -j16 instead of -j4 triggers an selinux error on my laptop, so this patch needs rethinking. I'll have a look at this when I get back to work on tuesday. Still haven't fixed the selinux error, but I'll send a patch with PARALLEL_MAKEINST="" today or tomorrow to run through the autobuilder. > > regards, > > Koen > > >> >> Sau! >> >>> regards, >>> >>> Koen >>> >>> >>> >>>> >>>> >>>> Sau! >>>> >>>> >>>> >>>>> # ${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 = " \ >>>>> @@ -75,6 +81,7 @@ PERLTOOLS = " \ >>>>> PACKAGES =+ "${PN}-perltools" >>>>> FILES_${PN}-perltools += " \ >>>>> ${PERLTOOLS} \ >>>>> + ${prefix}/lib/perl \ >>>>> ${datadir}/perl \ >>>>> " >>>>> RDEPENDS_${PN}-perltools = "${PN} perl perl-module-file-path findutils" >>>>> >>>> -- >>>> _______________________________________________ >>>> Openembedded-core mailing list >>>> Openembedded-core@lists.openembedded.org >>>> http://lists.openembedded.org/mailman/listinfo/openembedded-core ^ permalink raw reply [flat|nested] 8+ messages in thread
end of thread, other threads:[~2014-04-22 12:50 UTC | newest] Thread overview: 8+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2014-04-17 9:07 [PATCH 1/3] git: fix perl binding installation Koen Kooi 2014-04-17 9:07 ` [PATCH 2/3] liberror-perl: add 0.17022 Koen Kooi 2014-04-17 9:07 ` [PATCH 3/3] git: add a runtime depency for liberror-perl to git-perltools Koen Kooi 2014-04-18 20:25 ` [PATCH 1/3] git: fix perl binding installation Saul Wold 2014-04-19 7:24 ` Koen Kooi 2014-04-19 15:47 ` Saul Wold 2014-04-20 8:02 ` Koen Kooi 2014-04-22 12:50 ` Koen Kooi
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.