summaryrefslogtreecommitdiffstats
path: root/scripts/combo-layer
diff options
context:
space:
mode:
authorPaul Eggleton <paul.eggleton@linux.intel.com>2011-07-25 08:08:10 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-07-27 11:02:40 (GMT)
commitee3304b8b089eb816a1c9b1cd2db5544b27e0947 (patch)
tree408c5f514b193a05e229c0e75fb068e3217ec665 /scripts/combo-layer
parent89b30c36b1db2545b4093c7b809c63b5b1abfc8c (diff)
downloadpoky-ee3304b8b089eb816a1c9b1cd2db5544b27e0947.tar.gz
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>
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 84cc48f..d129175 100755
--- a/scripts/combo-layer
+++ b/scripts/combo-layer
@@ -254,7 +254,7 @@ def action_apply_patch(conf, args):
254 for line in open(repo['patchlist']): 254 for line in open(repo['patchlist']):
255 patchfile = line.split()[0] 255 patchfile = line.split()[0]
256 lastrev = line.split()[1] 256 lastrev = line.split()[1]
257 cmd = "git am -s -p1 %s" % patchfile 257 cmd = "git am --keep-cr -s -p1 %s" % patchfile
258 logger.info("Apply %s" % patchfile ) 258 logger.info("Apply %s" % patchfile )
259 try: 259 try:
260 runcmd(cmd) 260 runcmd(cmd)