diff options
| author | Paul Eggleton <paul.eggleton@linux.intel.com> | 2014-12-19 11:41:47 +0000 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-12-21 12:37:18 +0000 |
| commit | 1cfcae0cd0bc776f5bb91a75bb8ffdad3d7bf200 (patch) | |
| tree | 5daf31217ca890096de465ebe1375cd1ddaae47d /meta/lib | |
| parent | 8c522846093809a8deb866079e73fa317266c80e (diff) | |
| download | openembedded-core-1cfcae0cd0bc776f5bb91a75bb8ffdad3d7bf200.tar.gz openembedded-core-1cfcae0cd0bc776f5bb91a75bb8ffdad3d7bf200.tar.bz2 openembedded-core-1cfcae0cd0bc776f5bb91a75bb8ffdad3d7bf200.zip | |
lib/oe/patch: use --keep-cr with git am
Preserving carriage returns is important where the patch contains them.
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.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): return runcmd(["sh", "-c", " ".join(shellcmd)], self.dir) try: - shellcmd = ["git", "--work-tree=.", "am", "-3", "-p%s" % patch['strippath']] + shellcmd = ["git", "--work-tree=.", "am", "-3", "--keep-cr", "-p%s" % patch['strippath']] return _applypatchhelper(shellcmd, patch, force, reverse, run) except CmdError: # Fall back to git apply |