Bug 3725

Summary: guilt: unsupported version of git (1.8.0.2)
Product: [Build System, Metadata & Runtime] OE-Core Reporter: Stefan Herbrechtsmeier <stefan>
Component: devtools / tool chainAssignee: Bruce Ashfield <bruce.ashfield>
Status: RESOLVED FIXED QA Contact:
Severity: normal    
Priority: Medium CC: dvhart, meta.mr.watcher, meta.watcher
Version: unspecified   
Target Milestone: 1.4 M4   
Hardware: All   
OS: Multiple   
Whiteboard:
OS type for building Yocto: --- Type of Regression: ---
Verified: Documentation change: ---
Attachments:
Description Flags
guilt: update supported versions none

Description Stefan Herbrechtsmeier 2013-01-16 10:30:06 UTC
The current version of git is not supported by guilt and breaks linux-yocto when used with additional patches.
Comment 1 Bruce Ashfield 2013-01-16 13:48:25 UTC
Stefan: one more question. Can you dump the exact git version that shows the error ? If 
it's the version in oe-core master, that's fine as well, I just want to be clear about the
version before starting.
Comment 2 Bruce Ashfield 2013-01-16 15:11:48 UTC
hah. I do see the git version in the title of the case :) I just ran a test on oe-core master
and can patch with git-native there. This sounds like the oe-core provided git isn't
being used, and instead the host version.

What's your host ? and host git version ?

I'll first fix the issue of the host git being used, and then fix the git version issue.
Comment 3 Stefan Herbrechtsmeier 2013-01-16 15:15:22 UTC
Created attachment 1012 [details]
guilt: update supported versions
Comment 4 Bruce Ashfield 2013-01-16 15:16:33 UTC
See my late update, I already have guilt patched for this, I'm more concerned how
it is not using the git from oe-core. 

Can you confirm your host distro and git version ?
Comment 5 Stefan Herbrechtsmeier 2013-01-16 15:25:25 UTC
It is using the git from oe-core which is 1.8.0.2. My host distro is ubuntu lucid and the git version is 1.7.0.4.
Comment 6 Bruce Ashfield 2013-01-16 15:26:20 UTC
perfect! thanks for the info.
Comment 7 Darren Hart 2013-01-17 15:41:30 UTC
Bruce, can we kill guilt already?
Comment 8 Bruce Ashfield 2013-01-17 15:43:08 UTC
guilt needs to stay for this release. git am won't apply many of the patches that are floating
in the various out of tree layers. guilt can deal with them, so we need that functionality.

I have enhancements to git am that would be stretch to get done for yocto 1.4, without 
breaking compatibility.
Comment 9 Bruce Ashfield 2013-01-18 16:55:13 UTC
commit 349e5bea53b02cabf836b8943541a002ce9ba682
Author: Bruce Ashfield <bruce.ashfield@windriver.com>
Date:   Fri Jan 18 00:19:32 2013 -0500

    guilt: add git 1.8.x support
    
    Updating guilt to allow git 1.8.x as a supported version. This version has
    no impact on other functionality within the scripts, so no other adjustments
    are necessary.
    
    [YOCTO #3275]
    
    (From OE-Core rev: 18bc7b44ef58cbcbe32d45504d71eed54ef695a4)
    
    Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
    Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>