From: Paul Eggleton Date: Mon, 6 Feb 2017 20:30:49 +0000 (+1300) Subject: classes/patch: switch to new bb.build.tasksbetween() function X-Git-Tag: lucaceresoli/bug-15201-perf-libtraceevent-missing~22590 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1226e2eb2678407c315befd5700e653602e616a0;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git 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. Signed-off-by: Paul Eggleton Signed-off-by: Richard Purdie --- diff --git a/meta/classes/patch.bbclass b/meta/classes/patch.bbclass index d0806bcda24..8f35cb4f953 100644 --- a/meta/classes/patch.bbclass +++ b/meta/classes/patch.bbclass @@ -12,25 +12,7 @@ inherit terminal python () { if d.getVar('PATCHTOOL') == 'git' and d.getVar('PATCH_COMMIT_FUNCTIONS') == '1': - tasks = list(filter(lambda k: d.getVarFlag(k, "task"), d.keys())) - extratasks = [] - def follow_chain(task, endtask, chain=None): - if not chain: - chain = [] - chain.append(task) - for othertask in tasks: - if othertask == task: - continue - if task == endtask: - for ctask in chain: - if ctask not in extratasks: - extratasks.append(ctask) - else: - deps = d.getVarFlag(othertask, 'deps', False) - if task in deps: - follow_chain(othertask, endtask, chain) - chain.pop() - follow_chain('do_unpack', 'do_patch') + extratasks = bb.build.tasksbetween('do_unpack', 'do_patch', d) try: extratasks.remove('do_unpack') except ValueError: