scripts/combo-layer: keep carriage returns at the end of lines
Use --keep-cr option to "git am" or otherwise we lose carriage returns which can be important for patches against files that use CRs. (From OE-Core rev: bab4952075245563787293428e031fa11d6cb2b4) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
parent
89b30c36b1
commit
ee3304b8b0
|
@ -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)
|
||||
|
|
Loading…
Reference in New Issue