summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2022-11-11 22:58:27 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2022-12-01 19:35:05 +0000
commitd02e6be2d69a76c1ef3074ee5a89fd66ee0632d0 (patch)
tree86cf92076597cbcf0a0e6e9964a4be8307fa2f2c
parent75d5813df2eae23c7e6075158b818fe2c8507d7e (diff)
downloadpoky-d02e6be2d69a76c1ef3074ee5a89fd66ee0632d0.tar.gz
sanity: Drop data finalize call
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>
-rw-r--r--meta/classes/sanity.bbclass11
1 files changed, 2 insertions, 9 deletions
diff --git a/meta/classes/sanity.bbclass b/meta/classes/sanity.bbclass
index f2b2e4dfaf..293e405f62 100644
--- a/meta/classes/sanity.bbclass
+++ b/meta/classes/sanity.bbclass
@@ -999,13 +999,6 @@ def check_sanity(sanity_data):
999 if status.messages != "": 999 if status.messages != "":
1000 raise_sanity_error(sanity_data.expand(status.messages), sanity_data, status.network_error) 1000 raise_sanity_error(sanity_data.expand(status.messages), sanity_data, status.network_error)
1001 1001
1002# Create a copy of the datastore and finalise it to ensure appends and
1003# overrides are set - the datastore has yet to be finalised at ConfigParsed
1004def copy_data(e):
1005 sanity_data = bb.data.createCopy(e.data)
1006 sanity_data.finalize()
1007 return sanity_data
1008
1009addhandler config_reparse_eventhandler 1002addhandler config_reparse_eventhandler
1010config_reparse_eventhandler[eventmask] = "bb.event.ConfigParsed" 1003config_reparse_eventhandler[eventmask] = "bb.event.ConfigParsed"
1011python config_reparse_eventhandler() { 1004python config_reparse_eventhandler() {
@@ -1016,13 +1009,13 @@ addhandler check_sanity_eventhandler
1016check_sanity_eventhandler[eventmask] = "bb.event.SanityCheck bb.event.NetworkTest" 1009check_sanity_eventhandler[eventmask] = "bb.event.SanityCheck bb.event.NetworkTest"
1017python check_sanity_eventhandler() { 1010python check_sanity_eventhandler() {
1018 if bb.event.getName(e) == "SanityCheck": 1011 if bb.event.getName(e) == "SanityCheck":
1019 sanity_data = copy_data(e) 1012 sanity_data = bb.data.createCopy(e.data)
1020 check_sanity(sanity_data) 1013 check_sanity(sanity_data)
1021 if e.generateevents: 1014 if e.generateevents:
1022 sanity_data.setVar("SANITY_USE_EVENTS", "1") 1015 sanity_data.setVar("SANITY_USE_EVENTS", "1")
1023 bb.event.fire(bb.event.SanityCheckPassed(), e.data) 1016 bb.event.fire(bb.event.SanityCheckPassed(), e.data)
1024 elif bb.event.getName(e) == "NetworkTest": 1017 elif bb.event.getName(e) == "NetworkTest":
1025 sanity_data = copy_data(e) 1018 sanity_data = bb.data.createCopy(e.data)
1026 if e.generateevents: 1019 if e.generateevents:
1027 sanity_data.setVar("SANITY_USE_EVENTS", "1") 1020 sanity_data.setVar("SANITY_USE_EVENTS", "1")
1028 bb.event.fire(bb.event.NetworkTestFailed() if check_connectivity(sanity_data) else bb.event.NetworkTestPassed(), e.data) 1021 bb.event.fire(bb.event.NetworkTestFailed() if check_connectivity(sanity_data) else bb.event.NetworkTestPassed(), e.data)