summaryrefslogtreecommitdiffstats
path: root/meta/lib
diff options
context:
space:
mode:
authorPaul Eggleton <paul.eggleton@linux.intel.com>2014-12-19 11:41:47 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-12-21 12:37:56 +0000
commit37db9e62f06087a8ad46ab5babce3037d18edbfb (patch)
treef8830b7c19f36df96f80362e18d033b6f95b5b20 /meta/lib
parent400933b0501b651f3c67d93570eb929da5ed02b4 (diff)
downloadpoky-37db9e62f06087a8ad46ab5babce3037d18edbfb.tar.gz
lib/oe/patch: use --keep-cr with git am
Preserving carriage returns is important where the patch contains them. (From OE-Core rev: 1cfcae0cd0bc776f5bb91a75bb8ffdad3d7bf200) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/lib')
-rw-r--r--meta/lib/oe/patch.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/lib/oe/patch.py b/meta/lib/oe/patch.py
index 2d56ba404e..2bf30651eb 100644
--- a/meta/lib/oe/patch.py
+++ b/meta/lib/oe/patch.py
@@ -287,7 +287,7 @@ class GitApplyTree(PatchTree):
287 return runcmd(["sh", "-c", " ".join(shellcmd)], self.dir) 287 return runcmd(["sh", "-c", " ".join(shellcmd)], self.dir)
288 288
289 try: 289 try:
290 shellcmd = ["git", "--work-tree=.", "am", "-3", "-p%s" % patch['strippath']] 290 shellcmd = ["git", "--work-tree=.", "am", "-3", "--keep-cr", "-p%s" % patch['strippath']]
291 return _applypatchhelper(shellcmd, patch, force, reverse, run) 291 return _applypatchhelper(shellcmd, patch, force, reverse, run)
292 except CmdError: 292 except CmdError:
293 # Fall back to git apply 293 # Fall back to git apply