dpkg:do_patch failure with today's updates to dizzy branch

dpkg:do_patch failure with today's updates to dizzy branch

[Chatre, Reinette]

Hi,

Today there was an update to the dizzy branch that includes the patch below:

commit f77133783e5145858ac94b9bae1576852a7e838d
Author: Richard Purdie <richard.purdie@linuxfoundation.org>
Date:   Sat Mar 28 08:50:27 2015 +0000

    dpkg-native: Avoid 'file changed' errors from tar
    
    Hardlink count duing do_package_write_deb can change causing dpkg-deb
    failures. We don't care about this error case so avoid it by checking
    the tar exit code.
    
    [YOCTO #7529]
    
    (From OE-Core rev: 8ee36a5f2f9367550d28bf271afc53bca6ff3d5f)
    
    (From OE-Core rev: bcb124931af57dc2f9d8fe9cbbabd5f8ee58e414)
    
    Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>


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)

Reinette

Re: 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