summaryrefslogtreecommitdiff
path: root/scripts/combo-layer
diff options
context:
space:
mode:
authorPaul Eggleton <paul.eggleton@linux.intel.com>2011-07-25 09:08:10 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-07-27 11:54:49 +0100
commitbab4952075245563787293428e031fa11d6cb2b4 (patch)
treebd961609f0696fd50b2431b4a230ec6bf14c8d43 /scripts/combo-layer
parentf707be7ad16003af6e260297b29e30c92f02a612 (diff)
downloadopenembedded-core-bab4952075245563787293428e031fa11d6cb2b4.tar.gz
openembedded-core-bab4952075245563787293428e031fa11d6cb2b4.tar.bz2
openembedded-core-bab4952075245563787293428e031fa11d6cb2b4.zip
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. Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Diffstat (limited to 'scripts/combo-layer')
-rwxr-xr-xscripts/combo-layer2
1 files changed, 1 insertions, 1 deletions
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)