The combo-layer tool had trouble handling merge commits as they were included in the revision list but not the patches; these are now excluded from the revision list.
Signed-off-by: Paul Eggleton <[email protected]> --- scripts/combo-layer | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/scripts/combo-layer b/scripts/combo-layer index f8763ee..d6d238d 100755 --- a/scripts/combo-layer +++ b/scripts/combo-layer @@ -218,7 +218,7 @@ def action_update(conf, args): logger.debug("generated patch set:\n%s" % output) patchlist = output.splitlines() - rev_cmd = 'git log --pretty=format:"%H" ' + rev_cmd_range + rev_cmd = 'git rev-list --no-merges ' + rev_cmd_range revlist = runcmd(rev_cmd, ldir).splitlines() # Step 3: Call repo specific hook to adjust patch -- 1.7.5.4 _______________________________________________ Openembedded-core mailing list [email protected] http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
