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

Revert "Add "flash_fastboot_vendor_id" deviceinfo variable for fastboot flash method (#857)" (!1818)

Browse source 
This reverts commit 6fb5b28e2f.

The -i option was removed from fastboot, so we can't use it anymore
unless we fork the package. There was only one device using it,
amazon-thor. I will add a note to the wiki page.

Fixes #1830.
This commit is contained in:
Oliver Smith 2019-09-26 22:32:53 +02:00
parent ff4965ddfc
commit 7b8dc01d9e
No known key found for this signature in database
GPG key ID: 5AE7F5513E0885CB
3 changed files with 8 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

17
pmb/config/__init__.py
View file

@ -274,7 +274,6 @@ deviceinfo_attributes = [
"flash_offset_tags", "flash_offset_tags",
"flash_pagesize", "flash_pagesize",
"flash_fastboot_max_size", "flash_fastboot_max_size",
"flash_fastboot_vendor_id",
"flash_sparse", "flash_sparse",
"rootfs_image_sector_size", "rootfs_image_sector_size",
"sd_embed_firmware", "sd_embed_firmware",
@ -339,7 +338,7 @@ $IMAGE: Path to the rootfs image
$PARTITION_KERNEL: Partition to flash the kernel/boot.img to $PARTITION_KERNEL: Partition to flash the kernel/boot.img to
$PARTITION_SYSTEM: Partition to flash the rootfs to $PARTITION_SYSTEM: Partition to flash the rootfs to
Fastboot specific: $KERNEL_CMDLINE, $VENDOR_ID Fastboot specific: $KERNEL_CMDLINE
Heimdall specific: $PARTITION_INITFS Heimdall specific: $PARTITION_INITFS
uuu specific: $UUU_SCRIPT uuu specific: $UUU_SCRIPT
""" """
@ -348,14 +347,12 @@ flashers = {
"depends": ["android-tools"], "depends": ["android-tools"],
"actions": "actions":
{ {
"list_devices": [["fastboot", "-i", "$VENDOR_ID", "list_devices": [["fastboot", "devices", "-l"]],
"devices", "-l"]], "flash_rootfs": [["fastboot", "flash", "$PARTITION_SYSTEM",
"flash_rootfs": [["fastboot", "-i", "$VENDOR_ID", "$IMAGE"]],
"flash", "$PARTITION_SYSTEM", "$IMAGE"]], "flash_kernel": [["fastboot", "flash", "$PARTITION_KERNEL",
"flash_kernel": [["fastboot", "-i", "$VENDOR_ID", "$BOOT/boot.img-$FLAVOR"]],
"flash", "$PARTITION_KERNEL", "$BOOT/boot.img-$FLAVOR"]], "boot": [["fastboot", "-c", "$KERNEL_CMDLINE", "boot",
"boot": [["fastboot", "-i", "$VENDOR_ID",
"-c", "$KERNEL_CMDLINE", "boot",
"$BOOT/boot.img-$FLAVOR"]], "$BOOT/boot.img-$FLAVOR"]],
}, },
}, },

2
pmb/flasher/run.py
View file

@ -54,7 +54,7 @@ def run(args, action, flavor=None):
for key, value in vars.items(): for key, value in vars.items():
for i in range(len(command)): for i in range(len(command)):
if key in command[i]: if key in command[i]:
if not value and key not in ["$KERNEL_CMDLINE", "$VENDOR_ID"]: if not value and key != "$KERNEL_CMDLINE":
raise RuntimeError("Variable " + key + " found in" raise RuntimeError("Variable " + key + " found in"
" action " + action + " for method " + method + "," " action " + action + " for method " + method + ","
" but the value for this variable is None! Is that" " but the value for this variable is None! Is that"

1
pmb/flasher/variables.py
View file

@ -39,7 +39,6 @@ def variables(args, flavor, method):
"$BOOT": "/mnt/rootfs_" + args.device + "/boot", "$BOOT": "/mnt/rootfs_" + args.device + "/boot",
"$FLAVOR": flavor if flavor is not None else "", "$FLAVOR": flavor if flavor is not None else "",
"$IMAGE": "/home/pmos/rootfs/" + args.device + ".img", "$IMAGE": "/home/pmos/rootfs/" + args.device + ".img",
"$VENDOR_ID": args.deviceinfo["flash_fastboot_vendor_id"],
"$KERNEL_CMDLINE": _cmdline, "$KERNEL_CMDLINE": _cmdline,
"$PARTITION_KERNEL": _partition_kernel, "$PARTITION_KERNEL": _partition_kernel,
"$PARTITION_INITFS": args.deviceinfo["flash_heimdall_partition_initfs"] or "RECOVERY", "$PARTITION_INITFS": args.deviceinfo["flash_heimdall_partition_initfs"] or "RECOVERY",