diff options
Diffstat (limited to 'meta/lib')
-rw-r--r-- | meta/lib/oe/patch.py | 2 |
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 |