Administration/pmbootstrap-meow
2
0
Fork 0
forked from Mirror/pmbootstrap
Code Pull requests Activity Actions

treewide: switch back to bootimg_qcdt{,_type}

Browse source 
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
Download patch file Download diff file Expand all files Collapse all files

16
test/aportgen/test_device.py
View file

@ -13,11 +13,11 @@ test_data: dict[str, tuple[Bootimg | None, list[str], list[str]]] = {
Bootimg(
cmdline="beep boop",
header_version="0",
qcdt="false",
bootimg_qcdt="false",
base="0x80000000",
kernel_offset="0x8000",
tags_offset="0x100",
qcdt_type=None,
bootimg_qcdt_type=None,
dtb_offset=None,
dtb_second="",
pagesize="2048",
@ -39,11 +39,11 @@ test_data: dict[str, tuple[Bootimg | None, list[str], list[str]]] = {
Bootimg(
cmdline="console=ttyMSM0,115200n8",
header_version="2",
qcdt="false",
bootimg_qcdt="false",
base="0x80000000",
kernel_offset="",
tags_offset="",
qcdt_type=None,
bootimg_qcdt_type=None,
dtb_offset="0x101f00000",
dtb_second="",
pagesize="2048",
@ -58,19 +58,17 @@ test_data: dict[str, tuple[Bootimg | None, list[str], list[str]]] = {
'append_dtb="false"',
'flash_offset_dtb="0x101f00000"',
],
[
"qcdt",
],
[],
),
"header_v3": (
Bootimg(
cmdline="console=ttyMSM0,115200n8",
header_version="3",
qcdt="false",
bootimg_qcdt="false",
base="",
kernel_offset="",
tags_offset="",
qcdt_type=None,
bootimg_qcdt_type=None,
dtb_offset="",
dtb_second="",
pagesize="4096",

4
test/parse/test_bootimg.py
View file

@ -79,7 +79,7 @@ def test_bootimg(bootimg, pmb_args, pmaports):
print(f"Header v0: {img}")
assert img["header_version"] == "0", "header v0 expected header version 0"
assert img["cmdline"] == "", "header v0 expected empty cmdline"
assert img["qcdt"] == "false", "header v0 expected qcdt false"
assert img["bootimg_qcdt"] == "false", "header v0 expected qcdt false"
assert img["base"] == "0x80000000", "header v0 expected base 0x80000000"
assert int(img["kernel_offset"], 16) == 0x8000, "header v0 expected kernel offset 0x8000"
assert int(img["tags_offset"], 16) == 0x100, "header v0 expected tags offset 0x100"
@ -91,7 +91,7 @@ def test_bootimg(bootimg, pmb_args, pmaports):
print(f"Header v2: {img}")
assert img["header_version"] == "2", "header v2 expected header version 2"
assert img["cmdline"] == "", "header v2 expected empty cmdline"
assert img["qcdt"] == "false", "header v2 expected qcdt false"
assert img["bootimg_qcdt"] == "false", "header v2 expected qcdt false"
assert img["base"] == "0x80000000", "header v2 expected base 0x80000000"
assert int(img["kernel_offset"], 16) == 0x8000, "header v2 expected kernel offset 0x8000"
assert int(img["tags_offset"], 16) == 0x100, "header v2 expected tags offset 0x100"