diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2022-11-11 22:58:27 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2022-11-14 16:19:43 +0000 |
commit | b955eea19737f7f224dd40a0cfd8e35b0a2c6d51 (patch) | |
tree | 64a478c053960d2ae11146a15dc0775f31030bea /meta/classes-global/sanity.bbclass | |
parent | 7c1e70efccea05e050de43423e6612c2d2eaf450 (diff) | |
download | poky-b955eea19737f7f224dd40a0cfd8e35b0a2c6d51.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: d3eb4531aae28a07cb7e52ed5fe1102445d2effd)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes-global/sanity.bbclass')
-rw-r--r-- | meta/classes-global/sanity.bbclass | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/meta/classes-global/sanity.bbclass b/meta/classes-global/sanity.bbclass index 38f4a4b22f..bc188eefb7 100644 --- a/meta/classes-global/sanity.bbclass +++ b/meta/classes-global/sanity.bbclass | |||
@@ -1003,13 +1003,6 @@ def check_sanity(sanity_data): | |||
1003 | if status.messages != "": | 1003 | if status.messages != "": |
1004 | raise_sanity_error(sanity_data.expand(status.messages), sanity_data, status.network_error) | 1004 | raise_sanity_error(sanity_data.expand(status.messages), sanity_data, status.network_error) |
1005 | 1005 | ||
1006 | # Create a copy of the datastore and finalise it to ensure appends and | ||
1007 | # overrides are set - the datastore has yet to be finalised at ConfigParsed | ||
1008 | def copy_data(e): | ||
1009 | sanity_data = bb.data.createCopy(e.data) | ||
1010 | sanity_data.finalize() | ||
1011 | return sanity_data | ||
1012 | |||
1013 | addhandler config_reparse_eventhandler | 1006 | addhandler config_reparse_eventhandler |
1014 | config_reparse_eventhandler[eventmask] = "bb.event.ConfigParsed" | 1007 | config_reparse_eventhandler[eventmask] = "bb.event.ConfigParsed" |
1015 | python config_reparse_eventhandler() { | 1008 | python config_reparse_eventhandler() { |
@@ -1020,13 +1013,13 @@ addhandler check_sanity_eventhandler | |||
1020 | check_sanity_eventhandler[eventmask] = "bb.event.SanityCheck bb.event.NetworkTest" | 1013 | check_sanity_eventhandler[eventmask] = "bb.event.SanityCheck bb.event.NetworkTest" |
1021 | python check_sanity_eventhandler() { | 1014 | python check_sanity_eventhandler() { |
1022 | if bb.event.getName(e) == "SanityCheck": | 1015 | if bb.event.getName(e) == "SanityCheck": |
1023 | sanity_data = copy_data(e) | 1016 | sanity_data = bb.data.createCopy(e.data) |
1024 | check_sanity(sanity_data) | 1017 | check_sanity(sanity_data) |
1025 | if e.generateevents: | 1018 | if e.generateevents: |
1026 | sanity_data.setVar("SANITY_USE_EVENTS", "1") | 1019 | sanity_data.setVar("SANITY_USE_EVENTS", "1") |
1027 | bb.event.fire(bb.event.SanityCheckPassed(), e.data) | 1020 | bb.event.fire(bb.event.SanityCheckPassed(), e.data) |
1028 | elif bb.event.getName(e) == "NetworkTest": | 1021 | elif bb.event.getName(e) == "NetworkTest": |
1029 | sanity_data = copy_data(e) | 1022 | sanity_data = bb.data.createCopy(e.data) |
1030 | if e.generateevents: | 1023 | if e.generateevents: |
1031 | sanity_data.setVar("SANITY_USE_EVENTS", "1") | 1024 | sanity_data.setVar("SANITY_USE_EVENTS", "1") |
1032 | bb.event.fire(bb.event.NetworkTestFailed() if check_connectivity(sanity_data) else bb.event.NetworkTestPassed(), e.data) | 1025 | bb.event.fire(bb.event.NetworkTestFailed() if check_connectivity(sanity_data) else bb.event.NetworkTestPassed(), e.data) |