diff options
| author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2022-11-11 22:58:27 +0000 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2022-12-01 19:35:11 +0000 |
| commit | f71f6e702bf9ec711d243a8d2c22e026ec3f2418 (patch) | |
| tree | 4caf0e7e95e1d83d7eb12ef5bcfd0bab42a35bfb | |
| parent | 1f54e22375f056d9888ef4ad0738996a56b3b63a (diff) | |
| download | poky-f71f6e702bf9ec711d243a8d2c22e026ec3f2418.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: 2be6815946e87a670c809e7fa6e7034a84693e45)
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-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 606444cae1..8cf42036f6 100644 --- a/meta/classes-global/sanity.bbclass +++ b/meta/classes-global/sanity.bbclass | |||
| @@ -1005,13 +1005,6 @@ def check_sanity(sanity_data): | |||
| 1005 | if status.messages != "": | 1005 | if status.messages != "": |
| 1006 | raise_sanity_error(sanity_data.expand(status.messages), sanity_data, status.network_error) | 1006 | raise_sanity_error(sanity_data.expand(status.messages), sanity_data, status.network_error) |
| 1007 | 1007 | ||
| 1008 | # Create a copy of the datastore and finalise it to ensure appends and | ||
| 1009 | # overrides are set - the datastore has yet to be finalised at ConfigParsed | ||
| 1010 | def copy_data(e): | ||
| 1011 | sanity_data = bb.data.createCopy(e.data) | ||
| 1012 | sanity_data.finalize() | ||
| 1013 | return sanity_data | ||
| 1014 | |||
| 1015 | addhandler config_reparse_eventhandler | 1008 | addhandler config_reparse_eventhandler |
| 1016 | config_reparse_eventhandler[eventmask] = "bb.event.ConfigParsed" | 1009 | config_reparse_eventhandler[eventmask] = "bb.event.ConfigParsed" |
| 1017 | python config_reparse_eventhandler() { | 1010 | python config_reparse_eventhandler() { |
| @@ -1022,13 +1015,13 @@ addhandler check_sanity_eventhandler | |||
| 1022 | check_sanity_eventhandler[eventmask] = "bb.event.SanityCheck bb.event.NetworkTest" | 1015 | check_sanity_eventhandler[eventmask] = "bb.event.SanityCheck bb.event.NetworkTest" |
| 1023 | python check_sanity_eventhandler() { | 1016 | python check_sanity_eventhandler() { |
| 1024 | if bb.event.getName(e) == "SanityCheck": | 1017 | if bb.event.getName(e) == "SanityCheck": |
| 1025 | sanity_data = copy_data(e) | 1018 | sanity_data = bb.data.createCopy(e.data) |
| 1026 | check_sanity(sanity_data) | 1019 | check_sanity(sanity_data) |
| 1027 | if e.generateevents: | 1020 | if e.generateevents: |
| 1028 | sanity_data.setVar("SANITY_USE_EVENTS", "1") | 1021 | sanity_data.setVar("SANITY_USE_EVENTS", "1") |
| 1029 | bb.event.fire(bb.event.SanityCheckPassed(), e.data) | 1022 | bb.event.fire(bb.event.SanityCheckPassed(), e.data) |
| 1030 | elif bb.event.getName(e) == "NetworkTest": | 1023 | elif bb.event.getName(e) == "NetworkTest": |
| 1031 | sanity_data = copy_data(e) | 1024 | sanity_data = bb.data.createCopy(e.data) |
| 1032 | if e.generateevents: | 1025 | if e.generateevents: |
| 1033 | sanity_data.setVar("SANITY_USE_EVENTS", "1") | 1026 | sanity_data.setVar("SANITY_USE_EVENTS", "1") |
| 1034 | bb.event.fire(bb.event.NetworkTestFailed() if check_connectivity(sanity_data) else bb.event.NetworkTestPassed(), e.data) | 1027 | bb.event.fire(bb.event.NetworkTestFailed() if check_connectivity(sanity_data) else bb.event.NetworkTestPassed(), e.data) |
