diff --git a/scripts/combo-layer b/scripts/combo-layer index 84cc48f6ff..d1291751fa 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)