From: Patrick Ohly <patrick.ohly@intel.com>
To: openembedded-core@lists.openembedded.org
Subject: [PATCH 0/2] combo-layer: exclude files
Date: Tue, 10 Mar 2015 11:10:47 +0100 [thread overview]
Message-ID: <1425982249-17652-1-git-send-email-patrick.ohly@intel.com> (raw)
I ran into the merge conflicts described in the second patch recently
due to changes in OE-core's conf sample files. Richard told me that he
is aware of the issue and just deals with it manually because he never
had time to automate it; I hope these patches do that sufficiently
well to be included.
They worked for me when I re-imported all patches in OE-core and
bitbake since Dizzy was branched off. I also tested "combo-layer init"
with files excluded.
Note that these patches may apply directly to master, but I haven't
tested that because in my tree I have them on top of the other two,
independent patches to combo-layer that I posted yesterday. I can
resend as a single patch series if that's preferred.
Patrick Ohly (2):
combo-layer: runcmd() with separate output
combo-layer: exclude files
scripts/combo-layer | 59 ++++++++++++++++++++++++++++++++++------
scripts/combo-layer.conf.example | 14 ++++++++++
2 files changed, 65 insertions(+), 8 deletions(-)
--
2.1.4
next reply other threads:[~2015-03-10 10:10 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-03-10 10:10 Patrick Ohly [this message]
2015-03-10 10:10 ` [PATCH 1/2] combo-layer: runcmd() with separate output Patrick Ohly
2015-03-12 18:33 ` Paul Eggleton
2015-03-10 10:10 ` [PATCH 2/2] combo-layer: exclude files Patrick Ohly
2015-03-12 18:37 ` Paul Eggleton
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=1425982249-17652-1-git-send-email-patrick.ohly@intel.com \
--to=patrick.ohly@intel.com \
--cc=openembedded-core@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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox