summaryrefslogtreecommitdiffstats
path: root/meta/lib/oe
diff options
context:
space:
mode:
authorPaul Eggleton <paul.eggleton@linux.intel.com>2016-02-11 14:13:28 +1300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-02-11 12:33:02 +0000
commitddfe74447b3a50ae0b3533ace0e2b41e04a57bff (patch)
treee40e28043cf8d4f789435e343c1b8e797c7874ae /meta/lib/oe
parente36cb6c718587111af80bb41843b29f5c043095d (diff)
downloadpoky-ddfe74447b3a50ae0b3533ace0e2b41e04a57bff.tar.gz
devtool: commit for extra tasks that modify source when extracting
When extracting source for a recipe, if there are additional custom tasks run that make changes to the source, create a commit in the generated git branch so they are contained. This is particularly useful for tasks that come before do_patch since otherwise the changes might get incorporated in the first applied patch, but otherwise it helps avoid the tree being dirty at any point. Fixes [YOCTO #7626]. (From OE-Core rev: 997a77d9b20af1778b804778e5d8c8a7424f7582) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/lib/oe')
-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)