summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2016-06-12 23:57:53 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-06-14 12:56:32 +0100
commit2a6f88d51414993d18096f7f0dc27c0b862240bc (patch)
tree29b95f2352d676868c8516c2e55fe7b2e7db35ed
parent9764de92d5673d0f629555723321c933db015fe0 (diff)
downloadopenembedded-core-contrib-2a6f88d51414993d18096f7f0dc27c0b862240bc.tar.gz
openembedded-core-contrib-2a6f88d51414993d18096f7f0dc27c0b862240bc.tar.bz2
openembedded-core-contrib-2a6f88d51414993d18096f7f0dc27c0b862240bc.zip
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. Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/classes/staging.bbclass13
1 files changed, 13 insertions, 0 deletions
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):