[OE-core] [krogoth][PATCH] binutils: fix AR issue when opkg is unpacking IPKs containing empty entries

[Martin Jansa]

I see, there is ^M after empty in the actual .patch file, if I read the git
format-patch output it shows ^M, but the git webUI gets confused and shows
^M as normal line feed.

++    if ![string match "empty^M" $got] {

Does it work for you when cherry-picking from the branch.

Here is the same change in binutils git repo:
https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;a=blobdiff;f=binutils/testsuite/binutils-all/ar.exp;h=45be9b1b594b39624f3e010f50bf98892fb64549;hp=508ae9c1d7562c8b0a2c090a93e35acdba733944;hb=4fc874242f8f1bf17cf6e65b159dd804e793e6cd;hpb=23a4bd22c75862fdbaa5faef59b9094ec738f675

It shows '\r' so it isn't there by accident.


On Thu, Oct 6, 2016 at 12:54 PM, Martin Jansa <martin.jansa at gmail.com>
wrote:

> I see this strange line also in that branch, I'm checking log.do_patch to
> see how it's possible that it did apply to me OK.
>
> On Thu, Oct 6, 2016 at 12:46 PM, Martin Jansa <martin.jansa at gmail.com>
> wrote:
>
>> Strange,
>>
>> it's included here:
>> http://git.openembedded.org/openembedded-core-contrib/log/?
>> h=jansa/krogoth-backports
>>
>> until next rebase it's this commit SHA:
>> http://git.openembedded.org/openembedded-core-contrib/commit
>> /?h=jansa/krogoth-backports&id=9d56d74bc2f42cbd6ee6ad1dbddb378a020bbe93
>>
>> Thanks for quick reply
>>
>> On Thu, Oct 6, 2016 at 12:45 PM, Richard Purdie <
>> richard.purdie at linuxfoundation.org> wrote:
>>
>>> On Thu, 2016-10-06 at 10:23 +0200, Martin Jansa wrote:
>>> > ++    # This commmand used to fail with: "Malformed archive".
>>> > ++    set got [binutils_run $AR "-t $archive"]
>>> > ++    if ![string match "empty
>>> > " $got] {
>>> > ++    fail $testname
>>> > ++    return
>>> > ++    }
>>> > ++
>>> > ++    pass $testname
>>>
>>> The patch fails to apply due to the above corruption (line not starting
>>> ++). Could you resend or point to a branch with the patch on please?
>>>
>>> Cheers,
>>>
>>> Richard
>>>
>>
>>
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.openembedded.org/pipermail/openembedded-core/attachments/20161006/aca104ba/attachment-0002.html>