From: Patrick Ohly <patrick.ohly@intel.com>
To: openembedded-core@lists.openembedded.org
Subject: [PATCH 0/3] combo-layer import with history
Date: Mon, 2 May 2016 15:27:20 +0200 [thread overview]
Message-ID: <cover.1462195334.git.patrick.ohly@intel.com> (raw)
In Ostro OS we recently struggled with importing repositories that had
non-linear histories and duplicated patches; traditional "combo-layer
update" fails to import those because it cannot flatten the upstream
changes into a linear set of patches.
This enhanced combo-layer can deal with that by completely
re-implementing the update action such that it copies file trees
around instead of patches.
This adds basically another code path. It could also be maintained
separately, but as it might also be of interest to others, adding this
to OE-core is probably better, even though it makes the code more
complicated.
Probably some serious refactoring is due at some point, but that
should better be done only after defining some good test cases.
The following changes since commit 1a0e56630c5c27d8899dd0979ae0b86bbe227881:
utils.bbclass: note for deprecated base_contains (2016-04-29 07:53:58 +0100)
are available in the git repository at:
git://github.com/pohly/openembedded-core combo-layer-update-history
https://github.com/pohly/openembedded-core/tree/combo-layer-update-history
Patrick Ohly (3):
combo-layer: dummy "update with history"
combo-layer: runcmd() enhancements
combo-layer: implement "update with history"
scripts/combo-layer | 475 +++++++++++++++++++++++++++++++++++++++++++++++++---
1 file changed, 449 insertions(+), 26 deletions(-)
--
2.1.4
next reply other threads:[~2016-05-02 13:27 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-05-02 13:27 Patrick Ohly [this message]
2016-05-02 13:27 ` [PATCH 1/3] combo-layer: dummy "update with history" Patrick Ohly
2016-05-02 13:27 ` [PATCH 2/3] combo-layer: runcmd() enhancements Patrick Ohly
2016-05-02 13:27 ` [PATCH 3/3] combo-layer: implement "update with history" Patrick Ohly
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=cover.1462195334.git.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