sysmo-bts
/
generic-poky
9
0
Fork 0
Code Pull Requests Releases Activity

sanity.bbclass: Update against bitbake sanity event changes 

Bitbake will now trigger sanity events when it needs the checks to run in all cases
so we can drop the ConfigParsed hook. We now control whether events are generated
or errors are raised from the event itself.

(From OE-Core rev: 97108a5647f9278280c923ef69d2b0b945a26eef)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Richard Purdie 2014-03-26 15:09:06 +00:00
parent 2651e11cae
commit b015b64a9d
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
meta/classes/sanity.bbclass
View File

@ -779,20 +779,19 @@ def copy_data(e):
return sanity_data
addhandler check_sanity_eventhandler
check_sanity_eventhandler[eventmask] = "bb.event.ConfigParsed bb.event.SanityCheck bb.event.NetworkTest"
check_sanity_eventhandler[eventmask] = "bb.event.SanityCheck bb.event.NetworkTest"
python check_sanity_eventhandler() {
if bb.event.getName(e) == "ConfigParsed" and e.data.getVar("BB_WORKERCONTEXT", True) != "1" and e.data.getVar("DISABLE_SANITY_CHECKS", True) != "1":
if bb.event.getName(e) == "SanityCheck":
sanity_data = copy_data(e)
reparse = check_sanity(sanity_data)
e.data.setVar("BB_INVALIDCONF", reparse)
elif bb.event.getName(e) == "SanityCheck":
sanity_data = copy_data(e)
sanity_data.setVar("SANITY_USE_EVENTS", "1")
if e.generateevents:
sanity_data.setVar("SANITY_USE_EVENTS", "1")
reparse = check_sanity(sanity_data)
e.data.setVar("BB_INVALIDCONF", reparse)
bb.event.fire(bb.event.SanityCheckPassed(), e.data)
elif bb.event.getName(e) == "NetworkTest":
sanity_data = copy_data(e)
if e.generateevents:
sanity_data.setVar("SANITY_USE_EVENTS", "1")
bb.event.fire(bb.event.NetworkTestFailed() if check_connectivity(sanity_data) else bb.event.NetworkTestPassed(), e.data)
return