forked from Mirror/pmbootstrap
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:
parent
799140da2b
commit
f25a8bf374
6 changed files with 25 additions and 20 deletions
|
@ -124,8 +124,8 @@ def generate_deviceinfo_fastboot_content(bootimg: Bootimg | None = None) -> str:
|
|||
if bootimg is None:
|
||||
bootimg = Bootimg(
|
||||
cmdline="",
|
||||
qcdt="false",
|
||||
qcdt_type=None,
|
||||
bootimg_qcdt="false",
|
||||
bootimg_qcdt_type=None,
|
||||
dtb_offset=None,
|
||||
dtb_second="false",
|
||||
base="",
|
||||
|
@ -145,7 +145,13 @@ def generate_deviceinfo_fastboot_content(bootimg: Bootimg | None = None) -> str:
|
|||
deviceinfo_flash_pagesize="{bootimg["pagesize"]}"
|
||||
"""
|
||||
|
||||
for k in ["qcdt_type", "dtb_second", "mtk_label_kernel", "mtk_label_ramdisk", "header_version"]:
|
||||
for k in [
|
||||
"bootimg_qcdt_type",
|
||||
"dtb_second",
|
||||
"mtk_label_kernel",
|
||||
"mtk_label_ramdisk",
|
||||
"header_version",
|
||||
]:
|
||||
v = bootimg[k] # type: ignore
|
||||
if v:
|
||||
content += f"""\
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue