Merge branch '2021-07-28-assorted-fixes'

- Assorted bugfixes
This commit is contained in:
Tom Rini
2021-07-29 12:10:23 -04:00
17 changed files with 68 additions and 31 deletions

View File

@@ -146,7 +146,7 @@ def get_mksquashfs_version():
out = subprocess.run(['mksquashfs -version'], shell=True, check=True,
capture_output=True, text=True)
# 'out' is: mksquashfs version X (yyyy/mm/dd) ...
return float(out.stdout.split()[2])
return float(out.stdout.split()[2].split('-')[0])
def check_mksquashfs_version():
""" Checks if mksquashfs meets the required version. """