[OE-core] dpkg:do_patch failure with today's updates to dizzy branch

[Richard Purdie]

On Fri, 2015-04-17 at 23:05 +0000, Chatre, Reinette wrote:
> Today there was an update to the dizzy branch that includes the patch below:
>
> [...]
>
> Unfortunately the patch introduced by this commit does not apply cleanly to the version of dpkg that can be found in dizzy release. It seems that the patch was generated against dpkg version 1.17.21 while dizzy uses version 1.17.4. The build fails with:
> 
> NOTE: Applying patch 'tar-error-code.patch' (../meta/recipes-devtools/dpkg/dpkg/tar-error-code.patch)
> ERROR: Command Error: exit status: 1  Output:
> Applying patch tar-error-code.patch
> patching file dpkg-deb/build.c
> Hunk #1 succeeded at 443 (offset 45 lines).
> Hunk #2 FAILED at 493.
> Hunk #3 FAILED at 581.
> 2 out of 3 hunks FAILED -- rejects in file dpkg-deb/build.c
> Patch tar-error-code.patch does not apply (enforce with -f)

There was a mixup with some branches unfortunately but the correct patch
is now on the branch and this should be fixed. Thanks for reporting.

Cheers,

Richard