Use --keep-cr option to "git am" or otherwise we lose carriage returns which can be important for patches against files that use CRs.
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 84cc48f..d129175 100755 --- a/scripts/combo-layer +++ b/scripts/combo-layer @@ -254,7 +254,7 @@ def action_apply_patch(conf, args): for line in open(repo['patchlist']): patchfile = line.split()[0] lastrev = line.split()[1] - cmd = "git am -s -p1 %s" % patchfile + cmd = "git am --keep-cr -s -p1 %s" % patchfile logger.info("Apply %s" % patchfile ) try: runcmd(cmd) -- 1.7.4.1 _______________________________________________ Openembedded-core mailing list [email protected] http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
