diff options
| -rw-r--r-- | bitbake/lib/bb/utils.py | 7 | ||||
| -rw-r--r-- | bitbake/lib/ply/yacc.py | 7 |
2 files changed, 13 insertions, 1 deletions
diff --git a/bitbake/lib/bb/utils.py b/bitbake/lib/bb/utils.py index 66a8a08c21..bca4830f22 100644 --- a/bitbake/lib/bb/utils.py +++ b/bitbake/lib/bb/utils.py | |||
| @@ -545,7 +545,12 @@ def md5_file(filename): | |||
| 545 | Return the hex string representation of the MD5 checksum of filename. | 545 | Return the hex string representation of the MD5 checksum of filename. |
| 546 | """ | 546 | """ |
| 547 | import hashlib | 547 | import hashlib |
| 548 | return _hasher(hashlib.new('MD5', usedforsecurity=False), filename) | 548 | try: |
| 549 | sig = hashlib.new('MD5', usedforsecurity=False) | ||
| 550 | except TypeError: | ||
| 551 | # Some configurations don't appear to support two arguments | ||
| 552 | sig = hashlib.new('MD5') | ||
| 553 | return _hasher(sig, filename) | ||
| 549 | 554 | ||
| 550 | def sha256_file(filename): | 555 | def sha256_file(filename): |
| 551 | """ | 556 | """ |
diff --git a/bitbake/lib/ply/yacc.py b/bitbake/lib/ply/yacc.py index 767c4e4674..381b50cf0b 100644 --- a/bitbake/lib/ply/yacc.py +++ b/bitbake/lib/ply/yacc.py | |||
| @@ -2798,7 +2798,14 @@ class ParserReflect(object): | |||
| 2798 | def signature(self): | 2798 | def signature(self): |
| 2799 | try: | 2799 | try: |
| 2800 | import hashlib | 2800 | import hashlib |
| 2801 | except ImportError: | ||
| 2802 | raise RuntimeError("Unable to import hashlib") | ||
| 2803 | try: | ||
| 2801 | sig = hashlib.new('MD5', usedforsecurity=False) | 2804 | sig = hashlib.new('MD5', usedforsecurity=False) |
| 2805 | except TypeError: | ||
| 2806 | # Some configurations don't appear to support two arguments | ||
| 2807 | sig = hashlib.new('MD5') | ||
| 2808 | try: | ||
| 2802 | if self.start: | 2809 | if self.start: |
| 2803 | sig.update(self.start.encode('latin-1')) | 2810 | sig.update(self.start.encode('latin-1')) |
| 2804 | if self.prec: | 2811 | if self.prec: |
