* [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
* Re: [PATCH] git: add Git perl module to perltools package
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 13:28 ` [PATCH v2] " Peter A. Bigot
2014-10-08 3:44 ` [PATCH] " Robert Yang
2 siblings, 1 reply; 10+ messages in thread
From: Peter A. Bigot @ 2014-09-24 10:32 UTC (permalink / raw)
To: openembedded-core
Ping for this one too (it re-opened Yocto #3780 and has 1.7 as a due date).
That's all I expect to have for 1.7, unless u-boot 2014.07 gets in
(there's a patch needed for BBB in that case, but it's already in
meta-ti's version).
Peter
On 09/19/2014 12:44 PM, Peter A. Bigot wrote:
> 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"
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH] git: add Git perl module to perltools package
2014-09-24 10:32 ` Peter A. Bigot
@ 2014-09-25 10:49 ` Burton, Ross
2014-09-25 11:16 ` Peter A. Bigot
0 siblings, 1 reply; 10+ messages in thread
From: Burton, Ross @ 2014-09-25 10:49 UTC (permalink / raw)
To: Peter A. Bigot; +Cc: OE-core
On 24 September 2014 11:32, Peter A. Bigot <pab@pabigot.com> wrote:
> Ping for this one too (it re-opened Yocto #3780 and has 1.7 as a due date).
>
> That's all I expect to have for 1.7, unless u-boot 2014.07 gets in (there's
> a patch needed for BBB in that case, but it's already in meta-ti's version).
This produces errors for nativesdk builds:
ERROR: QA Issue: nativesdk-git: Files/directories were installed but not shipped
/opt/poky/1.7/sysroots/x86_64-pokysdk-linux/usr/lib/perl-native
/opt/poky/1.7/sysroots/x86_64-pokysdk-linux/usr/lib/perl-native/perl
/opt/poky/1.7/sysroots/x86_64-pokysdk-linux/usr/lib/perl-native/perl/5.20.0
/opt/poky/1.7/sysroots/x86_64-pokysdk-linux/usr/lib/perl-native/perl/5.20.0/Error.pm
/opt/poky/1.7/sysroots/x86_64-pokysdk-linux/usr/lib/perl-native/perl/5.20.0/Git.pm
/opt/poky/1.7/sysroots/x86_64-pokysdk-linux/usr/lib/perl-native/perl/5.20.0/perllocal.pod
/opt/poky/1.7/sysroots/x86_64-pokysdk-linux/usr/lib/perl-native/perl/5.20.0/auto
/opt/poky/1.7/sysroots/x86_64-pokysdk-linux/usr/lib/perl-native/perl/5.20.0/Git
/opt/poky/1.7/sysroots/x86_64-pokysdk-linux/usr/lib/perl-native/perl/5.20.0/auto/Git
/opt/poky/1.7/sysroots/x86_64-pokysdk-linux/usr/lib/perl-native/perl/5.20.0/auto/Git/.packlist
/opt/poky/1.7/sysroots/x86_64-pokysdk-linux/usr/lib/perl-native/perl/5.20.0/Git/SVN.pm
/opt/poky/1.7/sysroots/x86_64-pokysdk-linux/usr/lib/perl-native/perl/5.20.0/Git/IndexInfo.pm
/opt/poky/1.7/sysroots/x86_64-pokysdk-linux/usr/lib/perl-native/perl/5.20.0/Git/I18N.pm
/opt/poky/1.7/sysroots/x86_64-pokysdk-linux/usr/lib/perl-native/perl/5.20.0/Git/SVN
/opt/poky/1.7/sysroots/x86_64-pokysdk-linux/usr/lib/perl-native/perl/5.20.0/Git/SVN/GlobSpec.pm
/opt/poky/1.7/sysroots/x86_64-pokysdk-linux/usr/lib/perl-native/perl/5.20.0/Git/SVN/Ra.pm
/opt/poky/1.7/sysroots/x86_64-pokysdk-linux/usr/lib/perl-native/perl/5.20.0/Git/SVN/Log.pm
/opt/poky/1.7/sysroots/x86_64-pokysdk-linux/usr/lib/perl-native/perl/5.20.0/Git/SVN/Prompt.pm
/opt/poky/1.7/sysroots/x86_64-pokysdk-linux/usr/lib/perl-native/perl/5.20.0/Git/SVN/Utils.pm
/opt/poky/1.7/sysroots/x86_64-pokysdk-linux/usr/lib/perl-native/perl/5.20.0/Git/SVN/Fetcher.pm
/opt/poky/1.7/sysroots/x86_64-pokysdk-linux/usr/lib/perl-native/perl/5.20.0/Git/SVN/Editor.pm
/opt/poky/1.7/sysroots/x86_64-pokysdk-linux/usr/lib/perl-native/perl/5.20.0/Git/SVN/Migration.pm
/opt/poky/1.7/sysroots/x86_64-pokysdk-linux/usr/lib/perl-native/perl/5.20.0/Git/SVN/Memoize
/opt/poky/1.7/sysroots/x86_64-pokysdk-linux/usr/lib/perl-native/perl/5.20.0/Git/SVN/Memoize/YAML.pm
[installed-vs-shipped]
Ross
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH] git: add Git perl module to perltools package
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:23 ` Burton, Ross
0 siblings, 2 replies; 10+ messages in thread
From: Peter A. Bigot @ 2014-09-25 11:16 UTC (permalink / raw)
To: Burton, Ross; +Cc: OE-core
On 09/25/2014 05:49 AM, Burton, Ross wrote:
> On 24 September 2014 11:32, Peter A. Bigot <pab@pabigot.com> wrote:
>> Ping for this one too (it re-opened Yocto #3780 and has 1.7 as a due date).
>>
>> That's all I expect to have for 1.7, unless u-boot 2014.07 gets in (there's
>> a patch needed for BBB in that case, but it's already in meta-ti's version).
> This produces errors for nativesdk builds:
>
> ERROR: QA Issue: nativesdk-git: Files/directories were installed but not shipped
> /opt/poky/1.7/sysroots/x86_64-pokysdk-linux/usr/lib/perl-native
> /opt/poky/1.7/sysroots/x86_64-pokysdk-linux/usr/lib/perl-native/perl
> /opt/poky/1.7/sysroots/x86_64-pokysdk-linux/usr/lib/perl-native/perl/5.20.0
> /opt/poky/1.7/sysroots/x86_64-pokysdk-linux/usr/lib/perl-native/perl/5.20.0/Error.pm
> /opt/poky/1.7/sysroots/x86_64-pokysdk-linux/usr/lib/perl-native/perl/5.20.0/Git.pm
> /opt/poky/1.7/sysroots/x86_64-pokysdk-linux/usr/lib/perl-native/perl/5.20.0/perllocal.pod
> /opt/poky/1.7/sysroots/x86_64-pokysdk-linux/usr/lib/perl-native/perl/5.20.0/auto
> /opt/poky/1.7/sysroots/x86_64-pokysdk-linux/usr/lib/perl-native/perl/5.20.0/Git
> /opt/poky/1.7/sysroots/x86_64-pokysdk-linux/usr/lib/perl-native/perl/5.20.0/auto/Git
> /opt/poky/1.7/sysroots/x86_64-pokysdk-linux/usr/lib/perl-native/perl/5.20.0/auto/Git/.packlist
> /opt/poky/1.7/sysroots/x86_64-pokysdk-linux/usr/lib/perl-native/perl/5.20.0/Git/SVN.pm
> /opt/poky/1.7/sysroots/x86_64-pokysdk-linux/usr/lib/perl-native/perl/5.20.0/Git/IndexInfo.pm
> /opt/poky/1.7/sysroots/x86_64-pokysdk-linux/usr/lib/perl-native/perl/5.20.0/Git/I18N.pm
> /opt/poky/1.7/sysroots/x86_64-pokysdk-linux/usr/lib/perl-native/perl/5.20.0/Git/SVN
> /opt/poky/1.7/sysroots/x86_64-pokysdk-linux/usr/lib/perl-native/perl/5.20.0/Git/SVN/GlobSpec.pm
> /opt/poky/1.7/sysroots/x86_64-pokysdk-linux/usr/lib/perl-native/perl/5.20.0/Git/SVN/Ra.pm
> /opt/poky/1.7/sysroots/x86_64-pokysdk-linux/usr/lib/perl-native/perl/5.20.0/Git/SVN/Log.pm
> /opt/poky/1.7/sysroots/x86_64-pokysdk-linux/usr/lib/perl-native/perl/5.20.0/Git/SVN/Prompt.pm
> /opt/poky/1.7/sysroots/x86_64-pokysdk-linux/usr/lib/perl-native/perl/5.20.0/Git/SVN/Utils.pm
> /opt/poky/1.7/sysroots/x86_64-pokysdk-linux/usr/lib/perl-native/perl/5.20.0/Git/SVN/Fetcher.pm
> /opt/poky/1.7/sysroots/x86_64-pokysdk-linux/usr/lib/perl-native/perl/5.20.0/Git/SVN/Editor.pm
> /opt/poky/1.7/sysroots/x86_64-pokysdk-linux/usr/lib/perl-native/perl/5.20.0/Git/SVN/Migration.pm
> /opt/poky/1.7/sysroots/x86_64-pokysdk-linux/usr/lib/perl-native/perl/5.20.0/Git/SVN/Memoize
> /opt/poky/1.7/sysroots/x86_64-pokysdk-linux/usr/lib/perl-native/perl/5.20.0/Git/SVN/Memoize/YAML.pm
> [installed-vs-shipped]
I'm at a loss here. The probable fix is clear and I can send it as V2,
but I can't test it: no matter what I do, "bitbake git-nativesdk"
succeeds after attemping 0 tasks of which 0 were required. This with a
completely clean build environment, no shared state enabled,
uninstalling git from the development machine, and removing git-native
from meta's ASSUME_PROVIDED (which allowed git-native to build, but then
said nothing PROVIDES git-nativesdk).
Can you suggest a way to reproduce the problem? Or a pointer to the log
where the errors above can be seen in context?
Peter
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH] git: add Git perl module to perltools package
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:23 ` Burton, Ross
1 sibling, 1 reply; 10+ messages in thread
From: Paul Eggleton @ 2014-09-25 11:17 UTC (permalink / raw)
To: Peter A. Bigot; +Cc: openembedded-core
On Thursday 25 September 2014 06:16:11 Peter A. Bigot wrote:
> On 09/25/2014 05:49 AM, Burton, Ross wrote:
> > On 24 September 2014 11:32, Peter A. Bigot <pab@pabigot.com> wrote:
> >> Ping for this one too (it re-opened Yocto #3780 and has 1.7 as a due
> >> date).
> >>
> >> That's all I expect to have for 1.7, unless u-boot 2014.07 gets in
> >> (there's
> >> a patch needed for BBB in that case, but it's already in meta-ti's
> >> version).>
> > This produces errors for nativesdk builds:
> >
> > ERROR: QA Issue: nativesdk-git: Files/directories were installed but not
> > shipped>
> > /opt/poky/1.7/sysroots/x86_64-pokysdk-linux/usr/lib/perl-native
> > /opt/poky/1.7/sysroots/x86_64-pokysdk-linux/usr/lib/perl-native/perl
> > /opt/poky/1.7/sysroots/x86_64-pokysdk-linux/usr/lib/perl-native/perl/5.
> > 20.0
> > /opt/poky/1.7/sysroots/x86_64-pokysdk-linux/usr/lib/perl-native/perl/5.
> > 20.0/Error.pm
> > /opt/poky/1.7/sysroots/x86_64-pokysdk-linux/usr/lib/perl-native/perl/5
> > .20.0/Git.pm
> > /opt/poky/1.7/sysroots/x86_64-pokysdk-linux/usr/lib/perl-native/perl/5
> > .20.0/perllocal.pod
> > /opt/poky/1.7/sysroots/x86_64-pokysdk-linux/usr/lib/perl-native/perl/5
> > .20.0/auto
> > /opt/poky/1.7/sysroots/x86_64-pokysdk-linux/usr/lib/perl-native/perl/5
> > .20.0/Git
> > /opt/poky/1.7/sysroots/x86_64-pokysdk-linux/usr/lib/perl-native/perl/5
> > .20.0/auto/Git
> > /opt/poky/1.7/sysroots/x86_64-pokysdk-linux/usr/lib/perl-native/perl/5
> > .20.0/auto/Git/.packlist
> > /opt/poky/1.7/sysroots/x86_64-pokysdk-linux/usr/lib/perl-native/perl/5
> > .20.0/Git/SVN.pm
> > /opt/poky/1.7/sysroots/x86_64-pokysdk-linux/usr/lib/perl-native/perl/5
> > .20.0/Git/IndexInfo.pm
> > /opt/poky/1.7/sysroots/x86_64-pokysdk-linux/usr/lib/perl-native/perl/5
> > .20.0/Git/I18N.pm
> > /opt/poky/1.7/sysroots/x86_64-pokysdk-linux/usr/lib/perl-native/perl/5
> > .20.0/Git/SVN
> > /opt/poky/1.7/sysroots/x86_64-pokysdk-linux/usr/lib/perl-native/perl/5
> > .20.0/Git/SVN/GlobSpec.pm
> > /opt/poky/1.7/sysroots/x86_64-pokysdk-linux/usr/lib/perl-native/perl/5
> > .20.0/Git/SVN/Ra.pm
> > /opt/poky/1.7/sysroots/x86_64-pokysdk-linux/usr/lib/perl-native/perl/5
> > .20.0/Git/SVN/Log.pm
> > /opt/poky/1.7/sysroots/x86_64-pokysdk-linux/usr/lib/perl-native/perl/5
> > .20.0/Git/SVN/Prompt.pm
> > /opt/poky/1.7/sysroots/x86_64-pokysdk-linux/usr/lib/perl-native/perl/5
> > .20.0/Git/SVN/Utils.pm
> > /opt/poky/1.7/sysroots/x86_64-pokysdk-linux/usr/lib/perl-native/perl/5
> > .20.0/Git/SVN/Fetcher.pm
> > /opt/poky/1.7/sysroots/x86_64-pokysdk-linux/usr/lib/perl-native/perl/5
> > .20.0/Git/SVN/Editor.pm
> > /opt/poky/1.7/sysroots/x86_64-pokysdk-linux/usr/lib/perl-native/perl/5
> > .20.0/Git/SVN/Migration.pm
> > /opt/poky/1.7/sysroots/x86_64-pokysdk-linux/usr/lib/perl-native/perl/5
> > .20.0/Git/SVN/Memoize
> > /opt/poky/1.7/sysroots/x86_64-pokysdk-linux/usr/lib/perl-native/perl/5
> > .20.0/Git/SVN/Memoize/YAML.pm>
> > [installed-vs-shipped]
>
> I'm at a loss here. The probable fix is clear and I can send it as V2,
> but I can't test it: no matter what I do, "bitbake git-nativesdk"
> succeeds after attemping 0 tasks of which 0 were required. This with a
> completely clean build environment, no shared state enabled,
> uninstalling git from the development machine, and removing git-native
> from meta's ASSUME_PROVIDED (which allowed git-native to build, but then
> said nothing PROVIDES git-nativesdk).
Try: bitbake nativesdk-git
Cheers,
Paul
--
Paul Eggleton
Intel Open Source Technology Centre
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH] git: add Git perl module to perltools package
2014-09-25 11:16 ` Peter A. Bigot
2014-09-25 11:17 ` Paul Eggleton
@ 2014-09-25 11:23 ` Burton, Ross
1 sibling, 0 replies; 10+ messages in thread
From: Burton, Ross @ 2014-09-25 11:23 UTC (permalink / raw)
To: Peter A. Bigot; +Cc: OE-core
On 25 September 2014 12:16, Peter A. Bigot <pab@pabigot.com> wrote:
> Can you suggest a way to reproduce the problem? Or a pointer to the log
> where the errors above can be seen in context?
Build nativesdk-git, not git-nativesdk.
Ross
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH] git: add Git perl module to perltools package
2014-09-25 11:17 ` Paul Eggleton
@ 2014-09-25 11:35 ` Peter A. Bigot
2014-09-25 11:41 ` Burton, Ross
0 siblings, 1 reply; 10+ messages in thread
From: Peter A. Bigot @ 2014-09-25 11:35 UTC (permalink / raw)
To: Paul Eggleton; +Cc: openembedded-core
On 09/25/2014 06:17 AM, Paul Eggleton wrote:
> On Thursday 25 September 2014 06:16:11 Peter A. Bigot wrote:
>> I'm at a loss here. The probable fix is clear and I can send it as
>> V2, but I can't test it: no matter what I do, "bitbake git-nativesdk"
>> succeeds after attemping 0 tasks of which 0 were required. This with
>> a completely clean build environment, no shared state enabled,
>> uninstalling git from the development machine, and removing
>> git-native from meta's ASSUME_PROVIDED (which allowed git-native to
>> build, but then said nothing PROVIDES git-nativesdk).
> Try: bitbake nativesdk-git
Thanks; that appears to be more productive.
Shouldn't I have gotten the nothing PROVIDES warning for git-nativesdk
even with git-native in ASSUME_PROVIDED? I'm smelling a missing
end-of-line anchor in a regex somewhere.
Peter
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH] git: add Git perl module to perltools package
2014-09-25 11:35 ` Peter A. Bigot
@ 2014-09-25 11:41 ` Burton, Ross
0 siblings, 0 replies; 10+ messages in thread
From: Burton, Ross @ 2014-09-25 11:41 UTC (permalink / raw)
To: Peter A. Bigot; +Cc: Paul Eggleton, OE-core
On 25 September 2014 12:35, Peter A. Bigot <pab@pabigot.com> wrote:
> Shouldn't I have gotten the nothing PROVIDES warning for git-nativesdk even
> with git-native in ASSUME_PROVIDED? I'm smelling a missing end-of-line
> anchor in a regex somewhere.
Yes, me too.
Ross
^ permalink raw reply [flat|nested] 10+ messages in thread
* [PATCH v2] git: add Git perl module to perltools package
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 13:28 ` Peter A. Bigot
2014-10-08 3:44 ` [PATCH] " Robert Yang
2 siblings, 0 replies; 10+ messages in thread
From: Peter A. Bigot @ 2014-09-25 13:28 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>
---
V2:
- replace native cleanup command-in-variable with shell function
- invoke cleanup in nativesdk and target packages
meta/recipes-devtools/git/git.inc | 18 ++++++++----------
1 file changed, 8 insertions(+), 10 deletions(-)
diff --git a/meta/recipes-devtools/git/git.inc b/meta/recipes-devtools/git/git.inc
index 7633577..2515833 100644
--- a/meta/recipes-devtools/git/git.inc
+++ b/meta/recipes-devtools/git/git.inc
@@ -30,24 +30,21 @@ 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 = " \
+perl_native_fixup () {
sed -i -e 's#${STAGING_BINDIR_NATIVE}/perl-native/#${bindir}/#' \
-e 's#${libdir}/perl-native/#${libdir}/#' \
- ${@d.getVar("PERLTOOLS", True).replace(' /',d.getVar('D', True) + '/')} \
-"
+ ${@d.getVar("PERLTOOLS", True).replace(' /',d.getVar('D', True) + '/')}
+ mv ${D}${libdir}/perl-native/perl ${D}${libdir}
+ rmdir ${D}${libdir}/perl-native || true
+}
REL_GIT_EXEC_PATH = "${@os.path.relpath(libexecdir, bindir)}/git-core"
REL_GIT_TEMPLATE_DIR = "${@os.path.relpath(datadir, bindir)}/git-core/templates"
do_install_append_class-target () {
- ${PERLSEDFIXUP}
+ perl_native_fixup
}
do_install_append_class-native() {
@@ -60,7 +57,7 @@ do_install_append_class-nativesdk() {
create_wrapper ${D}${bindir}/git \
GIT_EXEC_PATH='`dirname $''realpath`'/${REL_GIT_EXEC_PATH} \
GIT_TEMPLATE_DIR='`dirname $''realpath`'/${REL_GIT_TEMPLATE_DIR}
- ${PERLSEDFIXUP}
+ perl_native_fixup
}
FILES_${PN} += "${datadir}/git-core ${libexecdir}/git-core/"
@@ -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
* Re: [PATCH] git: add Git perl module to perltools package
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 13:28 ` [PATCH v2] " Peter A. Bigot
@ 2014-10-08 3:44 ` Robert Yang
2 siblings, 0 replies; 10+ messages in thread
From: Robert Yang @ 2014-10-08 3:44 UTC (permalink / raw)
To: Peter A. Bigot, openembedded-core
Hi Peter,
On 09/20/2014 01:44 AM, Peter A. Bigot wrote:
> 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
We can't use the ${libdir} to replace of the {D}${exec_prefix}/lib as
the comment said that:
# ${libdir} is not applicable here, perl-native files are always
# installed to /usr/lib on both 32/64 bits targets.
Other wise we would get errors when:
MACHINE = qemux86-64 and libdir = /usr/lib64:
mv: cannot stat `/path/to/image/usr/lib64/perl-native/perl': No such file
or directory
I will send a patch to fix it.
// Robert
> }
>
> 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"
>
^ permalink raw reply [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