mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-05-09 17:39:31 +00:00
Code Issues Projects Releases Wiki Activity

sanity: Drop data finalize call

Browse Source 
This call was effectively like update_data and no longer did anything
in bitbake. Drop it as it is obsolete.

(From OE-Core rev: 06e088ef6e961f05ca600612adcc71bff91f09be)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
(cherry picked from commit d3eb4531aae28a07cb7e52ed5fe1102445d2effd)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Richard Purdie
2022-11-11 22:58:27 +00:00
parent 75d5813df2
commit d02e6be2d6
1 changed files with 2 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta/classes/sanity.bbclass
+2 -9
View File
@@ -999,13 +999,6 @@ def check_sanity(sanity_data):
if status.messages != "": if status.messages != "":
raise_sanity_error(sanity_data.expand(status.messages), sanity_data, status.network_error) raise_sanity_error(sanity_data.expand(status.messages), sanity_data, status.network_error)
# Create a copy of the datastore and finalise it to ensure appends and
# overrides are set - the datastore has yet to be finalised at ConfigParsed
def copy_data(e):
sanity_data = bb.data.createCopy(e.data)
sanity_data.finalize()
return sanity_data
addhandler config_reparse_eventhandler addhandler config_reparse_eventhandler
config_reparse_eventhandler[eventmask] = "bb.event.ConfigParsed" config_reparse_eventhandler[eventmask] = "bb.event.ConfigParsed"
python config_reparse_eventhandler() { python config_reparse_eventhandler() {
@@ -1016,13 +1009,13 @@ addhandler check_sanity_eventhandler
check_sanity_eventhandler[eventmask] = "bb.event.SanityCheck bb.event.NetworkTest" check_sanity_eventhandler[eventmask] = "bb.event.SanityCheck bb.event.NetworkTest"
python check_sanity_eventhandler() { python check_sanity_eventhandler() {
if bb.event.getName(e) == "SanityCheck": if bb.event.getName(e) == "SanityCheck":
sanity_data = copy_data(e) sanity_data = bb.data.createCopy(e.data)
check_sanity(sanity_data) check_sanity(sanity_data)
if e.generateevents: if e.generateevents:
sanity_data.setVar("SANITY_USE_EVENTS", "1") sanity_data.setVar("SANITY_USE_EVENTS", "1")
bb.event.fire(bb.event.SanityCheckPassed(), e.data) bb.event.fire(bb.event.SanityCheckPassed(), e.data)
elif bb.event.getName(e) == "NetworkTest": elif bb.event.getName(e) == "NetworkTest":
sanity_data = copy_data(e) sanity_data = bb.data.createCopy(e.data)
if e.generateevents: if e.generateevents:
sanity_data.setVar("SANITY_USE_EVENTS", "1") sanity_data.setVar("SANITY_USE_EVENTS", "1")
bb.event.fire(bb.event.NetworkTestFailed() if check_connectivity(sanity_data) else bb.event.NetworkTestPassed(), e.data) bb.event.fire(bb.event.NetworkTestFailed() if check_connectivity(sanity_data) else bb.event.NetworkTestPassed(), e.data)