[meta-qt5] Patch failing to apply

[meta-qt5] Patch failing to apply

[Otavio Salvador]

Hello,

The daisy branch seems to be broken. Please check:

recipe qtimageformats-5.2.1-r0: task do_patch: Started
ERROR: Command Error: exit status: 1  Output:
Applying patch 0001-qtimageformats.pro-Make-the-dependencies-determinist.patch
patching file qtimageformats.pro
Hunk #1 FAILED at 1.
1 out of 1 hunk FAILED -- rejects in file qtimageformats.pro
Patch 0001-qtimageformats.pro-Make-the-dependencies-determinist.patch
does not apply (enforce with -f)
ERROR: Function failed: patch_do_patch
ERROR: Logfile of failure stored in:
.../build/tmp/work/cortexa9hf-vfp-neon-oel-linux-gnueabi/qtimageformats/5.2.1-r0/temp/log.do_patch.22853

I catch this in our autobuilder.

-- 
Otavio Salvador                             O.S. Systems
http://www.ossystems.com.br        http://code.ossystems.com.br
Mobile: +55 (53) 9981-7854            Mobile: +1 (347) 903-9750

Re: [meta-qt5] Patch failing to apply

[Martin Jansa]

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

On Wed, Aug 06, 2014 at 02:59:06PM -0300, Otavio Salvador wrote:
> Hello,
> 
> The daisy branch seems to be broken. Please check:
> 
> recipe qtimageformats-5.2.1-r0: task do_patch: Started
> ERROR: Command Error: exit status: 1  Output:
> Applying patch 0001-qtimageformats.pro-Make-the-dependencies-determinist.patch
> patching file qtimageformats.pro
> Hunk #1 FAILED at 1.
> 1 out of 1 hunk FAILED -- rejects in file qtimageformats.pro
> Patch 0001-qtimageformats.pro-Make-the-dependencies-determinist.patch
> does not apply (enforce with -f)
> ERROR: Function failed: patch_do_patch
> ERROR: Logfile of failure stored in:
> .../build/tmp/work/cortexa9hf-vfp-neon-oel-linux-gnueabi/qtimageformats/5.2.1-r0/temp/log.do_patch.22853

I'm sorry, it was pushed to daisy by accident, I'll revert it.

-- 
Martin 'JaMa' Jansa     jabber: Martin.Jansa@gmail.com

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 188 bytes --]