diff options
| author | Tom Rini <trini@konsulko.com> | 2021-02-14 09:27:46 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2021-02-14 09:27:46 -0500 |
| commit | a6ba59583abd4085db5ab00358d751f175e2a451 (patch) | |
| tree | ea047196d0b01763798a90b3d1fc8f2364f109ad /tools/buildman/builder.py | |
| parent | 7c82e12cc4e9e25d7c89fe15bfeec4e9b0bb2b4d (diff) | |
| parent | fd434f47d4d008d41f4ee2fe5cb94791f780395c (diff) | |
Merge tag 'efi-2021-04-rc2-2' of https://gitlab.denx.de/u-boot/custodians/u-boot-efi
Pull request for UEFI sub-system for efi-2021-04-rc2-2
Bug fixes:
* fix stack smashing in UEFI capsule updates
* correct loading of UEFI binaries where Virtual size is not a
multiple of FileAlignment
* simplify detection of capsule files.
* buildman: use threading.is_alive() instead of removed method IsAlive()
Diffstat (limited to 'tools/buildman/builder.py')
| -rw-r--r-- | tools/buildman/builder.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/buildman/builder.py b/tools/buildman/builder.py index c93946842a3..6f6d759329a 100644 --- a/tools/buildman/builder.py +++ b/tools/buildman/builder.py @@ -1691,7 +1691,7 @@ class Builder: term = threading.Thread(target=self.queue.join) term.setDaemon(True) term.start() - while term.isAlive(): + while term.is_alive(): term.join(100) # Wait until we have processed all output |