From 8a5c8fcc3e5a401814f5a4ea63818427f3522c2d Mon Sep 17 00:00:00 2001 From: Luca Weiss Date: Mon, 14 Oct 2019 22:49:02 +0200 Subject: [PATCH] Fix detection of qcdt boot images (!1826) mkbootimg from osm0sis changed the filename of the dtb section in [1] which breaks the detection of qcdt in pmbootstrap. Fix this by adjusting the filename pmbootstrap checks to match the unpackbootimg behavior. [1] https://github.com/osm0sis/mkbootimg/commit/d8222a4d --- pmb/parse/bootimg.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pmb/parse/bootimg.py b/pmb/parse/bootimg.py index 31cfa5b0..2eee1de0 100644 --- a/pmb/parse/bootimg.py +++ b/pmb/parse/bootimg.py @@ -75,8 +75,8 @@ def bootimg(args, path): output["pagesize"] = f.read().replace('\n', '') with open(bootimg_path + "-cmdline", 'r') as f: output["cmdline"] = f.read().replace('\n', '') - output["qcdt"] = ("true" if os.path.isfile(bootimg_path + "-dtb") and - os.path.getsize(bootimg_path + "-dtb") > 0 else "false") + output["qcdt"] = ("true" if os.path.isfile(bootimg_path + "-dt") and + os.path.getsize(bootimg_path + "-dt") > 0 else "false") # Cleanup pmb.chroot.root(args, ["rm", "-r", temp_path])