[oe] [meta-oe][PATCH 3/5] dnsmasq: fix parallel make issue

[Martin Jansa]

On Mon, Aug 11, 2014 at 10:46:47AM +0200, Martin Jansa wrote:
> On Sun, Aug 10, 2014 at 05:36:32PM -0700, Christopher Larson wrote:
> > On Sun, Aug 10, 2014 at 2:24 AM, Martin Jansa <martin.jansa at gmail.com>
> > wrote:
> > 
> > > > From: Christopher Larson <chris_larson at mentor.com>
> > >
> > > Is this v2 of this change which was sent earlier?
> > >
> > 
> > 
> > They should be the same, just this one is part of a series with other
> > changes. Either should work fine for that particular issue.
> 
> There were some smaller differences (like Upstream-Status and SRC_URI
> addition in .inc instead of .bb).
> 
> I've resolved them as conflicts in next patch.

Hmm, maybe not correctly, can you please check what's wrong in
master-next or resend rebased v2?

NOTE: Running task 16205 of 29186 (ID: 11621, /home/jenkins/oe/world/shr-core/meta-openembedded/meta-networking/recipes-support/dnsmasq/dnsmasq_2.68.bb, do_patch)
NOTE: recipe dnsmasq-2.68-r0: task do_patch: Started
ERROR: Command Error: exit status: 1  Output:
Applying patch lua.patch
patching file Makefile
Hunk #1 FAILED at 57.
1 out of 1 hunk FAILED -- rejects in file Makefile
Patch lua.patch does not apply (enforce with -f)
ERROR: Function failed: patch_do_patch
ERROR: Logfile of failure stored in: /home/jenkins/oe/world/shr-core/tmp-eglibc/work/armv5te-oe-linux-gnueabi/dnsmasq/2.68-r0/temp/log.do_patch.24548
NOTE: recipe dnsmasq-2.68-r0: task do_patch: Failed
ERROR: Task 11621 (/home/jenkins/oe/world/shr-core/meta-openembedded/meta-networking/recipes-support/dnsmasq/dnsmasq_2.68.bb, do_patch) failed with exit code '1'

-- 
Martin 'JaMa' Jansa     jabber: Martin.Jansa at gmail.com
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 181 bytes
Desc: Digital signature
URL: <http://lists.openembedded.org/pipermail/openembedded-devel/attachments/20140811/552eabda/attachment-0002.sig>