Patchwork [*RFC,CONSOLIDATED,PULL,RFC*,03/23] git: restore the dependency on perl-native

login
register
mail settings
Submitter Saul Wold
Date June 13, 2011, 6:54 a.m.
Message ID <42c945e9af04b3e9733253b1186abe13bc80bde7.1307947593.git.sgw@linux.intel.com>
Download mbox | patch
Permalink /patch/5707/
State New, archived
Headers show

Comments

Saul Wold - June 13, 2011, 6:54 a.m.
From: Dexuan Cui <dexuan.cui@intel.com>

[YOCTO #1155]

I thought git-native could depend on perl-native-runtime and tests on
Ubuntu 9.04/10.10 and Fedora 13 show it could buid fine (looks these distros
install perl-ExtUtils-MakeMaker by default).

However Joshua reported on Fedora 15 i686 host, git-native can't build unless
he manually installed perl-ExtUtils-MakeMaker to the host.

This makes me think we may as well make git-native depend on perl-native.

Signed-off-by: Dexuan Cui <dexuan.cui@intel.com>
---
 meta/recipes-devtools/git/git.inc        |    6 +++---
 meta/recipes-devtools/git/git_1.7.5.1.bb |    2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)
Phil Blundell - June 14, 2011, 12:53 p.m.
On Sun, 2011-06-12 at 23:54 -0700, Saul Wold wrote:
> -inherit autotools
> +inherit autotools perlnative

This broke the tree for me.  Now I get:

NOTE: Out of date cache found, rebuilding...
ERROR: Could not inherit file
classes/perlnative.bbclass###########################################
| ETA:  00:00:03
ERROR: Command execution failed: Exited with 1

Am I meant to have perlnative.bbclass somewhere?  It isn't in
meta/classes.

p.
Koen Kooi - June 14, 2011, 12:54 p.m.
Op 14 jun 2011, om 14:53 heeft Phil Blundell het volgende geschreven:

> On Sun, 2011-06-12 at 23:54 -0700, Saul Wold wrote:
>> -inherit autotools
>> +inherit autotools perlnative
> 
> This broke the tree for me.  Now I get:
> 
> NOTE: Out of date cache found, rebuilding...
> ERROR: Could not inherit file
> classes/perlnative.bbclass###########################################
> | ETA:  00:00:03
> ERROR: Command execution failed: Exited with 1
> 
> Am I meant to have perlnative.bbclass somewhere?  It isn't in
> meta/classes.

Same error here
Phil Blundell - June 14, 2011, 1:01 p.m.
On Tue, 2011-06-14 at 13:53 +0100, Phil Blundell wrote:
> On Sun, 2011-06-12 at 23:54 -0700, Saul Wold wrote:
> > -inherit autotools
> > +inherit autotools perlnative
> 
> This broke the tree for me.  Now I get:
> 
> NOTE: Out of date cache found, rebuilding...
> ERROR: Could not inherit file
> classes/perlnative.bbclass###########################################
> | ETA:  00:00:03
> ERROR: Command execution failed: Exited with 1

BTW, Scott, this is also a new addition to my list of unsatisfactory
bitbake error messages.  It would be more helpful if bitbake: (a)
printed the name of the recipe causing the problem, rather than leaving
me to grep the tree/guess, and (b) continued rather than immediately
bailing out.  Also, aesthetically, it'd be nice if it didn't print the
error on top of the status bar although I guess that is a minor issue in
the larger scheme of things.

However, on the positive side, at least there is no python
stacktrace :-)

p.
Richard Purdie - June 14, 2011, 1:40 p.m.
On Tue, 2011-06-14 at 14:01 +0100, Phil Blundell wrote:
> On Tue, 2011-06-14 at 13:53 +0100, Phil Blundell wrote:
> > On Sun, 2011-06-12 at 23:54 -0700, Saul Wold wrote:
> > > -inherit autotools
> > > +inherit autotools perlnative
> > 
> > This broke the tree for me.  Now I get:
> > 
> > NOTE: Out of date cache found, rebuilding...
> > ERROR: Could not inherit file
> > classes/perlnative.bbclass###########################################
> > | ETA:  00:00:03
> > ERROR: Command execution failed: Exited with 1
> 
> BTW, Scott, this is also a new addition to my list of unsatisfactory
> bitbake error messages.  It would be more helpful if bitbake: (a)
> printed the name of the recipe causing the problem, rather than leaving
> me to grep the tree/guess, and (b) continued rather than immediately
> bailing out.  Also, aesthetically, it'd be nice if it didn't print the
> error on top of the status bar although I guess that is a minor issue in
> the larger scheme of things.
> 
> However, on the positive side, at least there is no python
> stacktrace :-)

I've fixed this.

Unintentionally, a merge was made to poky but not to OE-Core for a
series of patches. I suspect somehow I did make the merge but not the
push and then lost the changes thinking it was just testing changes when
I came back to them.

So I'm sorry about the screw up there, totally my fault and unintended
and it should be fixed now.

Cheers,

Richard

Patch

diff --git a/meta/recipes-devtools/git/git.inc b/meta/recipes-devtools/git/git.inc
index c884f9c..5d77880 100644
--- a/meta/recipes-devtools/git/git.inc
+++ b/meta/recipes-devtools/git/git.inc
@@ -1,16 +1,16 @@ 
 DESCRIPTION = "The git revision control system used by the Linux kernel developers"
 SECTION = "console/utils"
 LICENSE = "GPLv2"
-DEPENDS = "perl-native openssl curl zlib expat"
+DEPENDS = "openssl curl zlib expat"
 
 SRC_URI = "${KERNELORG_MIRROR}/software/scm/git/git-${PV}.tar.bz2 "
 S = "${WORKDIR}/git-${PV}"
 
 LIC_FILES_CHKSUM = "file://COPYING;md5=7c0d7ef03a7eb04ce795b0f60e68e7e1"
 
-EXTRA_OECONF = "--with-perl=${STAGING_BINDIR_NATIVE}/perl --without-tcltk"
+EXTRA_OECONF = "--with-perl=${STAGING_BINDIR_NATIVE}/perl-native/perl --without-tcltk"
 
-inherit autotools
+inherit autotools perlnative
 
 do_install () {
 	oe_runmake install DESTDIR="${D}" bindir=${bindir} \
diff --git a/meta/recipes-devtools/git/git_1.7.5.1.bb b/meta/recipes-devtools/git/git_1.7.5.1.bb
index bfdbf62..04d1d56 100644
--- a/meta/recipes-devtools/git/git_1.7.5.1.bb
+++ b/meta/recipes-devtools/git/git_1.7.5.1.bb
@@ -1,6 +1,6 @@ 
 require git.inc
 
-PR = "r0"
+PR = "r2"
 
 EXTRA_OECONF += "ac_cv_snprintf_returns_bogus=no ac_cv_c_c99_format=yes \
                  ac_cv_fread_reads_directories=${ac_cv_fread_reads_directories=yes} \