Re: [PATCH] bash: Add fix for cross compile issues

[Michael Halstead <michael@yoctoproject.org>]

[-- Attachment #1: Type: text/plain, Size: 2518 bytes --]

On 11/14/2012 11:45 AM, Michael Halstead wrote:
> On 11/14/2012 05:30 AM, Richard Purdie wrote:
>> On Wed, 2012-11-14 at 13:24 +0000, Richard Purdie wrote:
>>> On Wed, 2012-11-14 at 13:30 +0100, Martin Jansa wrote:
>>>> On Tue, Nov 13, 2012 at 01:59:19PM +0000, Richard Purdie wrote:
>>>>> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
>>>>> ---
>>>>> diff --git a/meta/recipes-extended/bash/bash-4.2/crossfix.patch b/meta/recipes-extended/bash/bash-4.2/crossfix.patch
>>>>> new file mode 100644
>>>>> index 0000000..f587c34
>>>>> --- a/dev/null
>>>>> +++ b/meta/recipes-extended/bash/bash-4.2/crossfix.patch
>>>>> @@ -0,0 +1,28 @@
>>>> Are you using some special tool to generate git patches or some weird
>>>> git version?
>>> Basically, the data from cgit in the web interface is broken and that is
>>> causing this.
>>>
>>>> Patches from you where you add some file usually does not apply here,
>>>> It's caused by:
>>>> --- a/dev/null
>>>> +++ b/meta/recipes-extended/bash/bash-4.2/crossfix.patch
>>>> which usually looks like
>>>> --- /dev/null
>>>> +++ b/meta/recipes-extended/bash/bash-4.2/crossfix.patch
>>> Right, there is a bug in cgit. I'm not sure if anyone fancies trying to
>>> find/fix it?
>> Actually, its not hard to find:
>>
>> http://hjemli.net/git/cgit/tree/ui-patch.c
>>
>>
>> In header(), the:
>> 		htmlf("\n--- a/%s\n", path1);
>> 		htmlf("+++ b/%s\n", path2);
>> needs to be conditional on is_null_sha1(sha1)/is_null_sha1(sha2) with
>> the alternative of:
>> 		htmlf("\n--- /%s\n", path1);
>> 		htmlf("+++ /%s\n", path2);
>> which there are a variety of ways to achieve...
>>
>> Michael: Fancy fixing that on the server and sending a patch
>> upstream? :)
>>
>> Cheers,
>>
>> Richard
>>
> I'm happy to. I've fixed the code you've tracked down and recompiled for
> git.yoctoproject.org. You can see the result at
> https://git.yoctoproject.org/cgit/cgit.cgi/poky/patch/?id=ed234aca98d0867c7b32801fc63820b19cf67df9
> but I am still working on fixing the shared UI for this view
> https://git.yoctoproject.org/cgit/cgit.cgi/poky/commit/?id=ed234aca98d0867c7b32801fc63820b19cf67df9.
>
>
> Once I have both fixes I'll upgrade http://cgit.openembedded.org/ with
> the new version and submit my patch upstream.
>
I've submitted the patch upstream and installed a fixed copy of cgit on
cgit.openembedded.org. Please let me know if any errors in the
formatting remain.

Michael Halstead
Yocto Project / Sys Admin



[-- Attachment #2: S/MIME Cryptographic Signature --]
[-- Type: application/pkcs7-signature, Size: 4516 bytes --]