summaryrefslogtreecommitdiffstats
path: root/meta/lib/oe/patch.py
diff options
context:
space:
mode:
Diffstat (limited to 'meta/lib/oe/patch.py')
-rw-r--r--meta/lib/oe/patch.py3
1 files changed, 3 insertions, 0 deletions
diff --git a/meta/lib/oe/patch.py b/meta/lib/oe/patch.py
index 4e77168dab..2464efdbe5 100644
--- a/meta/lib/oe/patch.py
+++ b/meta/lib/oe/patch.py
@@ -264,6 +264,7 @@ class PatchTree(PatchSet):
264 264
265class GitApplyTree(PatchTree): 265class GitApplyTree(PatchTree):
266 patch_line_prefix = '%% original patch' 266 patch_line_prefix = '%% original patch'
267 ignore_commit_prefix = '%% ignore'
267 268
268 def __init__(self, dir, d): 269 def __init__(self, dir, d):
269 PatchTree.__init__(self, dir, d) 270 PatchTree.__init__(self, dir, d)
@@ -384,6 +385,8 @@ class GitApplyTree(PatchTree):
384 if line.startswith(GitApplyTree.patch_line_prefix): 385 if line.startswith(GitApplyTree.patch_line_prefix):
385 outfile = line.split()[-1].strip() 386 outfile = line.split()[-1].strip()
386 continue 387 continue
388 if line.startswith(GitApplyTree.ignore_commit_prefix):
389 continue
387 patchlines.append(line) 390 patchlines.append(line)
388 if not outfile: 391 if not outfile:
389 outfile = os.path.basename(srcfile) 392 outfile = os.path.basename(srcfile)