From 0918ac9fdd94999bfed571f3e411da1a87dc3438 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Sun, 12 Jun 2016 23:57:53 +0100 Subject: staging: Add BB_SETSCENE_VERIFY_FUNCTION2 for bitbake runqueue changes We're about to rewrite the data structures in taskdata/runqueue in bitbake and we 'leaked' knowledge about those structures to this single function. Add a 'v2' function definition for use with the newer bitbake, the older one can remain for compatibility for a while, then be removed. The function is comparatively simple and rarely changes. (From OE-Core rev: 2a6f88d51414993d18096f7f0dc27c0b862240bc) Signed-off-by: Richard Purdie --- meta/classes/staging.bbclass | 13 +++++++++++++ 1 file changed, 13 insertions(+) (limited to 'meta/classes') diff --git a/meta/classes/staging.bbclass b/meta/classes/staging.bbclass index 30f2b507e1..a0b09a00bd 100644 --- a/meta/classes/staging.bbclass +++ b/meta/classes/staging.bbclass @@ -181,6 +181,19 @@ python sysroot_cleansstate () { do_configure[prefuncs] += "sysroot_cleansstate" +BB_SETSCENE_VERIFY_FUNCTION2 = "sysroot_checkhashes2" + +def sysroot_checkhashes2(covered, tasknames, fns, d, invalidtasks): + problems = set() + configurefns = set() + for tid in invalidtasks: + if tasknames[tid] == "do_configure" and tid not in covered: + configurefns.add(fns[tid]) + for tid in covered: + if tasknames[tid] == "do_populate_sysroot" and fns[tid] in configurefns: + problems.add(tid) + return problems + BB_SETSCENE_VERIFY_FUNCTION = "sysroot_checkhashes" def sysroot_checkhashes(covered, tasknames, fnids, fns, d, invalidtasks = None): -- cgit 1.2.3-korg