diff options
Diffstat (limited to 'meta')
| -rw-r--r-- | meta/lib/oe/patch.py | 3 |
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): class GitApplyTree(PatchTree): patch_line_prefix = '%% original patch' + ignore_commit_prefix = '%% ignore' def __init__(self, dir, d): PatchTree.__init__(self, dir, d) @@ -384,6 +385,8 @@ class GitApplyTree(PatchTree): if line.startswith(GitApplyTree.patch_line_prefix): outfile = line.split()[-1].strip() continue + if line.startswith(GitApplyTree.ignore_commit_prefix): + continue patchlines.append(line) if not outfile: outfile = os.path.basename(srcfile) |