summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorPaul Eggleton <paul.eggleton@linux.intel.com>2017-02-07 09:30:49 +1300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-02-07 14:50:09 +0000
commit1a9f33ccc77f314ed3cf544044fd0059294be5a0 (patch)
tree671c3aba93ed2f47d00ea99bbfe3e5fe2c770be3 /meta
parent4b870ed47be7c7dd17dbe41e22a5a9c7ebea4a8d (diff)
downloadpoky-1a9f33ccc77f314ed3cf544044fd0059294be5a0.tar.gz
classes/patch: switch to new bb.build.tasksbetween() function
A generic version of the code to work out the tasks between two tasks (based on the code here) has been added to bb.build, so use that instead. (From OE-Core rev: 1226e2eb2678407c315befd5700e653602e616a0) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/classes/patch.bbclass20
1 files changed, 1 insertions, 19 deletions
diff --git a/meta/classes/patch.bbclass b/meta/classes/patch.bbclass
index d0806bcda2..8f35cb4f95 100644
--- a/meta/classes/patch.bbclass
+++ b/meta/classes/patch.bbclass
@@ -12,25 +12,7 @@ inherit terminal
12 12
13python () { 13python () {
14 if d.getVar('PATCHTOOL') == 'git' and d.getVar('PATCH_COMMIT_FUNCTIONS') == '1': 14 if d.getVar('PATCHTOOL') == 'git' and d.getVar('PATCH_COMMIT_FUNCTIONS') == '1':
15 tasks = list(filter(lambda k: d.getVarFlag(k, "task"), d.keys())) 15 extratasks = bb.build.tasksbetween('do_unpack', 'do_patch', d)
16 extratasks = []
17 def follow_chain(task, endtask, chain=None):
18 if not chain:
19 chain = []
20 chain.append(task)
21 for othertask in tasks:
22 if othertask == task:
23 continue
24 if task == endtask:
25 for ctask in chain:
26 if ctask not in extratasks:
27 extratasks.append(ctask)
28 else:
29 deps = d.getVarFlag(othertask, 'deps', False)
30 if task in deps:
31 follow_chain(othertask, endtask, chain)
32 chain.pop()
33 follow_chain('do_unpack', 'do_patch')
34 try: 16 try:
35 extratasks.remove('do_unpack') 17 extratasks.remove('do_unpack')
36 except ValueError: 18 except ValueError: