From: Martin Jansa <martin.jansa@gmail.com>
To: openembedded-devel@lists.openembedded.org
Subject: Re: [meta-oe][PATCH 3/5] dnsmasq: fix parallel make issue
Date: Mon, 11 Aug 2014 10:51:50 +0200 [thread overview]
Message-ID: <20140811085150.GV14848@jama> (raw)
In-Reply-To: <20140811084647.GU14848@jama>
[-- Attachment #1: Type: text/plain, Size: 1692 bytes --]
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@gmail.com>
> > wrote:
> >
> > > > From: Christopher Larson <chris_larson@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@gmail.com
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 188 bytes --]
next prev parent reply other threads:[~2014-08-11 8:51 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-08-10 1:01 [meta-oe][PATCH 0/5] Various dnsmasq fixes/improvements Christopher Larson
2014-08-10 1:01 ` [meta-oe][PATCH 1/5] dnsmasq: add missing inherit pkgconfig Christopher Larson
2014-08-10 1:01 ` [meta-oe][PATCH 2/5] dnsmasq: obey CFLAGS & LDFLAGS Christopher Larson
2014-08-10 1:01 ` [meta-oe][PATCH 3/5] dnsmasq: fix parallel make issue Christopher Larson
2014-08-10 9:24 ` Martin Jansa
2014-08-11 0:36 ` Christopher Larson
2014-08-11 8:46 ` Martin Jansa
2014-08-11 8:51 ` Martin Jansa [this message]
2014-08-11 15:54 ` Christopher Larson
2014-08-10 1:01 ` [meta-oe][PATCH 4/5] dnsmasq: look for lua.pc, not lua5.1.pc Christopher Larson
2014-08-10 1:01 ` [meta-oe][PATCH 5/5] dnsmasq: add packageconfigs for idn, conntrack, lua Christopher Larson
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20140811085150.GV14848@jama \
--to=martin.jansa@gmail.com \
--cc=openembedded-devel@lists.openembedded.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.