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 -- _______________________________________________ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core