treewide: switch back to bootimg_qcdt{,_type}

In some refactoring work deviceinfo_bootimg_qcdt and
deviceinfo_bootimg_qcdt_type were accidentally renamed to just
deviceinfo_qcdt{,_type}. Change back to original name everywhere.

Among the notable changes is that we modify the bootimg header_v2 test
so that bootimg_qcdt="false" is acceptable in the deviceinfo. I am not
sure why it was added to the !expected substrings, we have plenty of
header_v2 devices with the property set.

Part-of: https://gitlab.postmarketos.org/postmarketos/pmbootstrap/-/merge_requests/2628
Part-of: https://gitlab.postmarketos.org/postmarketOS/pmbootstrap/-/merge_requests/2628
This commit is contained in:
Henrik Grimler 2025-06-17 10:20:31 +02:00 committed by Henrik Grimler
parent 799140da2b
commit f25a8bf374
No known key found for this signature in database
GPG key ID: 7930459FB9303217
6 changed files with 25 additions and 20 deletions

View file

@ -155,7 +155,7 @@ def bootimg(path: Path) -> Bootimg:
with open(f"{bootimg_path}-pagesize") as f:
output["pagesize"] = trim_input(f)
output["qcdt"] = (
output["bootimg_qcdt"] = (
"true"
if os.path.isfile(f"{bootimg_path}-dt") and os.path.getsize(f"{bootimg_path}-dt") > 0
else "false"
@ -166,7 +166,7 @@ def bootimg(path: Path) -> Bootimg:
for key, value in {
"mtk_label_kernel": get_mtk_label(f"{bootimg_path}-kernel"),
"mtk_label_ramdisk": get_mtk_label(f"{bootimg_path}-ramdisk"),
"qcdt_type": get_qcdt_type(f"{bootimg_path}-dt"),
"bootimg_qcdt_type": get_qcdt_type(f"{bootimg_path}-dt"),
}.items()
if value is not None
}
@ -181,8 +181,8 @@ def bootimg(path: Path) -> Bootimg:
return Bootimg(
cmdline=output["cmdline"],
qcdt=output["qcdt"],
qcdt_type=output.get("qcdt_type"),
bootimg_qcdt=output["bootimg_qcdt"],
bootimg_qcdt_type=output.get("bootimg_qcdt_type"),
dtb_offset=output.get("dtb_offset"),
dtb_second=output["dtb_second"],
base=output.get("base", ""),